staging: rtl8188eu: Rename function ReadEFuseByIC() to efuse_ReadEFuse()

Rename ReadEFuseByIC() to efuse_ReadEFuse() and remove original
efuse_ReadEFuse() function, so that driver can call ReadEFuseByIC()
directly without going through efuse_ReadEFuse().

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index f2d374d5a764b10d3f89f901c7e661c6527663ad..ac77184bfb9b5276406258061ea71633ebf05e65 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -144,27 +144,6 @@ ReadEFuseByte(
        *pbuf = (u8)(value32 & 0xff);
 }
 
-/* Description:
- *     1. Execute E-Fuse read byte operation according as map offset and
- *     save to E-Fuse table.
- *     2. Referred from SD1 Richard.
- * Assumption:
- *     1. Boot from E-Fuse and successfully auto-load.
- *     2. PASSIVE_LEVEL (USB interface)
- *     Created by Roger, 2008.10.21.
- * 2008/12/12 MH
- *     1. Reorganize code flow and reserve bytes. and add description.
- *     2. Add efuse utilization collect.
- * 2008/12/22 MH
- *     Read Efuse must check if we write section 1 data again!!!
- *     Sec1 write addr must be after sec5.
- */
-
-static void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool pseudo)
-{
-       Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, pseudo);
-}
-
 /*-----------------------------------------------------------------------------
  * Function:   EFUSE_Read1Byte
  *

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index abf66e75784c1701deec448b020efa8ddae42f6a..75151028e53404113c98606387015f2a1c8aa77e 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -807,7 +807,7 @@ void Efuse_PowerSwitch(
        }
 }
 
-static void ReadEFuseByIC(struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest)
+void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest)
 {
        if (!bPseudoTest) {
                int ret = _FAIL;
@@ -1542,7 +1542,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;
 
        /*  Efuse related function */
-       pHalFunc->ReadEFuse = &ReadEFuseByIC;
        pHalFunc->Efuse_PgPacketRead = &hal_EfusePgPacketRead_8188e;
        pHalFunc->Efuse_PgPacketWrite = &hal_EfusePgPacketWrite_8188e;
 

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index a7cad6ff07cff0e72fe6499494445be6557fcca8..5e64df7416ff1be09b2da3a9890fe4fe684a9e1e 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -233,8 +233,6 @@ struct hal_ops {
                               enum rf_radio_path eRFPath, u32 RegAddr,
                               u32 BitMask, u32 Data);
 
-       void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset,
-                         u16 _size_byte, u8 *pbuf, bool bPseudoTest);
        int     (*Efuse_PgPacketRead)(struct adapter *adapter, u8 offset,
                                      u8 *data, bool bPseudoTest);
        bool    (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset,

diff --git a/drivers/staging/rtl8188eu/include/rtw_efuse.h b/drivers/staging/rtl8188eu/include/rtw_efuse.h
index 7d1f28f83c2a0b0e6c0a5c039b4cefdd04fac380..63a6c6ee3245476aa2f71802403efb123784ea03 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_efuse.h
+++ b/drivers/staging/rtl8188eu/include/rtw_efuse.h
@@ -135,6 +135,8 @@ void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,
 u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data, bool test);
 u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data, bool test);
 
+void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset,
+               u16 _size_byte, u8 *pbuf, bool bPseudoTest);
 void Efuse_PowerSwitch(struct adapter *adapt, u8 bWrite, u8  PwrState);
 int Efuse_PgPacketRead(struct adapter *adapt, u8 offset, u8 *data, bool test);
 int Efuse_PgPacketWrite(struct adapter *adapter, u8 offset, u8 word, u8 *data,