staging: r8188eu: remove Firmware* from struct hal_data_8188e

The fields FirmwareVersion, FirmwareSubVersion and FirmwareSignature
of struct hal_data_8188e are only used in the function
rtl8188e_FirmwareDownload(). Use local variables in that function and
remove the fields from struct hal_data_8188e. FirmwareVersionRev is
not used at all, remove it as well.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220107103620.15648-2-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 b818872e0d194d5988c5e34928bbbf506b1c8fe7..20e4a12801cf448099f8b2862e16726bb0357994 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -550,10 +550,10 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
        s32     rtStatus = _SUCCESS;
        u8 writeFW_retry = 0;
        u32 fwdl_start_time;
-       struct hal_data_8188e *pHalData = &padapter->haldata;
        struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
        struct device *device = dvobj_to_dev(dvobj);
        struct rt_firmware_hdr *pFwHdr = NULL;
+       u16 fw_version, fw_subversion, fw_signature;
        u8 *pFirmwareBuf;
        u32 FirmwareLen;
        static int log_version;
@@ -570,14 +570,13 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
        /*  To Check Fw header. Added by tynli. 2009.12.04. */
        pFwHdr = (struct rt_firmware_hdr *)dvobj->firmware.szFwBuffer;
 
-       pHalData->FirmwareVersion =  le16_to_cpu(pFwHdr->Version);
-       pHalData->FirmwareSubVersion = pFwHdr->Subversion;
-       pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature);
+       fw_version = le16_to_cpu(pFwHdr->Version);
+       fw_subversion = pFwHdr->Subversion;
+       fw_signature = le16_to_cpu(pFwHdr->Signature);
 
        if (!log_version++)
                pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
-                       DRIVER_PREFIX, pHalData->FirmwareVersion,
-                       pHalData->FirmwareSubVersion, pHalData->FirmwareSignature);
+                       DRIVER_PREFIX, fw_version, fw_subversion, fw_signature);
 
        if (IS_FW_HEADER_EXIST(pFwHdr)) {
                /*  Shift 32 bytes for FW header */

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 8134a173ea07ec8de952dc1ccfbe4b6e01912a74..9133f3b0acc1ad1ebafafa8d4a6ab2d47c70685c 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -162,10 +162,6 @@ struct txpowerinfo24g {
 
 struct hal_data_8188e {
        struct HAL_VERSION      VersionID;
-       u16     FirmwareVersion;
-       u16     FirmwareVersionRev;
-       u16     FirmwareSubVersion;
-       u16     FirmwareSignature;
        u8      PGMaxGroup;
        /* current WIFI_PHY values */
        u32     ReceiveConfig;