staging: r8188eu: remove rtl8188e_InitializeFirmwareVars()

Merge rtl8188e_InitializeFirmwareVars() into rtl8188eu_hal_init()
and remove rtl8188e_InitializeFirmwareVars().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220107103620.15648-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 20e4a12801cf448099f8b2862e16726bb0357994..dc41682fd8d65c71743d60c292fecfbc0b6dcac9 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -623,17 +623,6 @@ Exit:
        return rtStatus;
 }
 
-void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
-{
-       struct hal_data_8188e *pHalData = &padapter->haldata;
-
-       /*  Init Fw LPS related. */
-       padapter->pwrctrlpriv.bFwCurrentInPSMode = false;
-
-       /*  Init H2C counter. by tynli. 2009.12.09. */
-       pHalData->LastHMEBoxNum = 0;
-}
-
 /*  */
 /*                     Efuse related code */
 /*  */

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 96db9a8e7667514dc65f8090a47bd709bb1b016a..696beb29536f4dbdcdc131ea65ba3e3de9344a9f 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -636,7 +636,9 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
                Adapter->bFWReady = true;
                haldata->fw_ractrl = false;
        }
-       rtl8188e_InitializeFirmwareVars(Adapter);
+       /* Initialize firmware vars */
+       Adapter->pwrctrlpriv.bFwCurrentInPSMode = false;
+       haldata->LastHMEBoxNum = 0;
 
 #if (HAL_MAC_ENABLE == 1)
        status = PHY_MACConfig8188E(Adapter);

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 9133f3b0acc1ad1ebafafa8d4a6ab2d47c70685c..3da04751f25de7eb18432a62e0ef7dec0ad61e71 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -253,7 +253,6 @@ struct hal_data_8188e {
 /*  rtl8188e_hal_init.c */
 s32 rtl8188e_FirmwareDownload(struct adapter *padapter);
 void _8051Reset88E(struct adapter *padapter);
-void rtl8188e_InitializeFirmwareVars(struct adapter *padapter);
 
 s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);