summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Straube <straube.linux@gmail.com>2022-04-17 20:54:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-20 19:31:18 +0300
commit4ae19e7af2ce5e0fe8aab45706f9fc168d0cb97d (patch)
tree6b1a636646892bbf5efc02fbd4fc8c40cb1fc3fe
parent4e58dfad41320e65a3411c2c123fb115d3513335 (diff)
downloadlinux-4ae19e7af2ce5e0fe8aab45706f9fc168d0cb97d.tar.xz
staging: r8188eu: remove variables from rtl8188e_firmware_download()
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>
-rw-r--r--drivers/staging/r8188eu/core/rtw_fw.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index 42b36505cf8b..7fa985cc787a 100644
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -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);