staging: r8188eu: remove variables from rtl8188e_firmware_download()
authorMichael Straube <straube.linux@gmail.com>
Sun, 17 Apr 2022 17:54:39 +0000 (19:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Apr 2022 16:31:18 +0000 (18:31 +0200)
The local variables fw_version, fw_subversion, fw_signature in
rtl8188e_firmware_download() are only used in one place. Use the
assigned values directly and remove the variables to make the code
shorter and cleaner.

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220417175441.13830-7-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_fw.c

index 42b3650..7fa985c 100644 (file)
@@ -244,7 +244,6 @@ int rtl8188e_firmware_download(struct adapter *padapter)
        struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
        struct device *device = dvobj_to_dev(dvobj);
        struct rt_firmware_hdr *fwhdr = NULL;
-       u16 fw_version, fw_subversion, fw_signature;
        u8 *fw_data;
        u32 fw_size;
        static int log_version;
@@ -261,13 +260,10 @@ int rtl8188e_firmware_download(struct adapter *padapter)
        /*  To Check Fw header. Added by tynli. 2009.12.04. */
        fwhdr = (struct rt_firmware_hdr *)dvobj->firmware.data;
 
-       fw_version = le16_to_cpu(fwhdr->version);
-       fw_subversion = fwhdr->subversion;
-       fw_signature = le16_to_cpu(fwhdr->signature);
-
        if (!log_version++)
                pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
-                       DRIVER_PREFIX, fw_version, fw_subversion, fw_signature);
+                       DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion,
+                       le16_to_cpu(fwhdr->signature));
 
        if (IS_FW_HEADER_EXIST(fwhdr)) {
                fw_data = fw_data + sizeof(struct rt_firmware_hdr);