From: navin patidar Date: Fri, 20 Jun 2014 14:59:13 +0000 (+0530) Subject: staging: rtl8188eu: Rename Hal_EFUSEGetEfuseDefinition88E() X-Git-Tag: v3.17-rc1~123^2~1650 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=186e4257074d8fe5797144163171c25e94a969cf;p=~emulex%2Finfiniband.git staging: rtl8188eu: Rename Hal_EFUSEGetEfuseDefinition88E() Rename Hal_EFUSEGetEfuseDefinition88E() to rtl8188e_EFUSE_GetEfuseDefinition() and remove original rtl8188e_EFUSE_GetEfuseDefinition(), so that driver can call Hal_EFUSEGetEfuseDefinition88E() directly without going through rtl8188e_EFUSE_GetEfuseDefinition(). Signed-off-by: navin patidar Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c index b4504585d27..7752efd33ad 100644 --- a/drivers/staging/rtl8188eu/core/rtw_efuse.c +++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c @@ -229,7 +229,7 @@ static void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool pseudo ) { - pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, pseudo); + pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut); } /*----------------------------------------------------------------------------- diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c index 9dda5f65d67..7c05bbe657c 100644 --- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c @@ -957,7 +957,7 @@ exit: } /* Do not support BT */ -static void Hal_EFUSEGetEfuseDefinition88E(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut) +static void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut) { switch (type) { case TYPE_EFUSE_MAX_SECTION: @@ -1019,11 +1019,6 @@ static void Hal_EFUSEGetEfuseDefinition88E(struct adapter *pAdapter, u8 efuseTyp } } -static void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest) -{ - Hal_EFUSEGetEfuseDefinition88E(pAdapter, efuseType, type, pOut); -} - static u8 Hal_EfuseWordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest) { u16 tmpaddr = 0; diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h index ecc92a6a60c..d971e6e0e55 100644 --- a/drivers/staging/rtl8188eu/include/hal_intf.h +++ b/drivers/staging/rtl8188eu/include/hal_intf.h @@ -238,7 +238,7 @@ struct hal_ops { void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, - u8 type, void *pOut, bool bPseudoTest); + u8 type, void *pOut); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, bool bPseudoTest); int (*Efuse_PgPacketRead)(struct adapter *adapter, u8 offset,