Skip to contentSkip to conversation

staging: rtl8188eu: checkpatch cleanups in hal/fw.c

PATCH New Michael Straube 1 participant 4 messages Apr 13, 2020 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8188eu: checkpatch cleanups in hal/fw.c

This series clears the last remaining checkpatch issues in the file hal/fw.c.

Michael Straube (3):
staging: rtl8188eu: rename define to upper case
staging: rtl8188eu: cleanup long line in fw.c
staging: rtl8188eu: make const char array static

 drivers/staging/rtl8188eu/hal/fw.c                | 7 ++++---
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.0
#1 lore raw

PATCH 1/3 staging: rtl8188eu: rename define to upper case

Rename 'FWDL_ChkSum_rpt' to 'FWDL_CHKSUM_RPT' as defines are normaly named all upper case. Also clears a camel case checkpatch warning.

---
 drivers/staging/rtl8188eu/hal/fw.c                | 4 ++--
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8188eu/hal/fw.c +2 -2
index 486ee4bd4744..dbf7883f9ed7 100644
@@ -111,7 +111,7 @@ static int _rtl88e_fw_free_to_go(struct adapter *adapt)
 
 	do {
 		value32 = usb_read32(adapt, REG_MCUFWDL);
-		if (value32 & FWDL_ChkSum_rpt)
+		if (value32 & FWDL_CHKSUM_RPT)
 			break;
 	} while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
@@ -192,7 +192,7 @@ int rtl88eu_download_fw(struct adapter *adapt)
 		rtl88e_firmware_selfreset(adapt);
 	}
 	_rtl88e_enable_fw_download(adapt, true);
-	usb_write8(adapt, REG_MCUFWDL, usb_read8(adapt, REG_MCUFWDL) | FWDL_ChkSum_rpt);
+	usb_write8(adapt, REG_MCUFWDL, usb_read8(adapt, REG_MCUFWDL) | FWDL_CHKSUM_RPT);
 	_rtl88e_write_fw(adapt, download_data, download_size);
 	_rtl88e_enable_fw_download(adapt, false);
 
drivers/staging/rtl8188eu/include/rtl8188e_spec.h +1 -1
index dd943c831d91..be30c9434a29 100644
@@ -817,7 +817,7 @@ So the following defines for 92C is not entire!!!!!!
 /* 2 MCUFWDL */
 #define MCUFWDL_EN			BIT(0)
 #define MCUFWDL_RDY			BIT(1)
-#define FWDL_ChkSum_rpt			BIT(2)
+#define FWDL_CHKSUM_RPT			BIT(2)
 #define MACINI_RDY			BIT(3)
 #define BBINI_RDY			BIT(4)
 #define RFINI_RDY			BIT(5)
Signature · 1 line
2.26.0
#2 lore raw

PATCH 2/3 staging: rtl8188eu: cleanup long line in fw.c

In reply to Michael Straube

Add line break to avoid line length over 80 characters.

---
 drivers/staging/rtl8188eu/hal/fw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8188eu/hal/fw.c +2 -1
index dbf7883f9ed7..432e6bea5ea1 100644
@@ -192,7 +192,8 @@ int rtl88eu_download_fw(struct adapter *adapt)
 		rtl88e_firmware_selfreset(adapt);
 	}
 	_rtl88e_enable_fw_download(adapt, true);
-	usb_write8(adapt, REG_MCUFWDL, usb_read8(adapt, REG_MCUFWDL) | FWDL_CHKSUM_RPT);
+	usb_write8(adapt, REG_MCUFWDL,
+		   usb_read8(adapt, REG_MCUFWDL) | FWDL_CHKSUM_RPT);
 	_rtl88e_write_fw(adapt, download_data, download_size);
 	_rtl88e_enable_fw_download(adapt, false);
 
Signature · 1 line
2.26.0
#3 lore raw

PATCH 3/3 staging: rtl8188eu: make const char array static

In reply to Michael Straube

Make const char array 'fw_name' static. Clears a checkpatch warning and reduces object file size by 17 bytes (gcc 9.3.1 x86_64).

WARNING: const array should probably be static const

---
 drivers/staging/rtl8188eu/hal/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/hal/fw.c +1 -1
index 432e6bea5ea1..3d1d29e9f8e0 100644
@@ -146,7 +146,7 @@ int rtl88eu_download_fw(struct adapter *adapt)
 	struct dvobj_priv *dvobj = adapter_to_dvobj(adapt);
 	struct device *device = dvobj_to_dev(dvobj);
 	const struct firmware *fw;
-	const char fw_name[] = "rtlwifi/rtl8188eufw.bin";
+	static const char fw_name[] = "rtlwifi/rtl8188eufw.bin";
 	struct rtl92c_firmware_header *pfwheader = NULL;
 	u8 *download_data, *fw_data;
 	size_t download_size;
Signature · 1 line
2.26.0