Skip to contentSkip to conversation

staging: rtl8188eu: coding style fixup

PATCH In review Igor Bogomazov 3 participants 4 messages Oct 9, 2014 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8188eu: coding style fixup

checkpatch.pl tiny fix
get rid of 2 warnings and 2 errors for hal/fw.c

Cc Greg Kroah-Hartman <[email protected]>
Cc navin patidar <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
for linux-next 3.17.0

this is an updated version of the patch I've sent two days ago, that one did not apply cleanly

drivers/staging/rtl8188eu/hal/fw.c +5 -5
@@ -154,9 +154,8 @@ static int _rtl88e_fw_free_to_go(struct adapter *adapt)
 			break;
 	} while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
-	if (counter >= POLLING_READY_TIMEOUT_COUNT) {
+	if (counter >= POLLING_READY_TIMEOUT_COUNT)
 		goto exit;
-	}
 
 	value32 = usb_read32(adapt, REG_MCUFWDL);
 	value32 |= MCUFWDL_RDY;
@@ -193,13 +192,13 @@ int rtl88eu_download_fw(struct adapter *adapt)
 	u32 fwsize;
 	int err;
 
-	if (request_firmware(&fw, fw_name, device)){
+	if (request_firmware(&fw, fw_name, device)) {
 		dev_err(device, "Firmware %s not available\n", fw_name);
 		return -ENOENT;
 	}
 
 	if (fw->size > FW_8188E_SIZE) {
-		dev_err(device,"Firmware size exceed 0x%X. Check it.\n",
+		dev_err(device, "Firmware size exceed 0x%X. Check it.\n",
 			 FW_8188E_SIZE);
 		return -1;
 	}
@@ -226,7 +225,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, pfwdata, fwsize);
 	_rtl88e_enable_fw_download(adapt, false);
 
#1 lore raw

But you haven't CCed people in the CC list

Quoted 60 lines · Igor Bogomazov

checkpatch.pl tiny fix
get rid of 2 warnings and 2 errors for hal/fw.c

Cc Greg Kroah-Hartman <[email protected]>
Cc navin patidar <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
for linux-next 3.17.0

this is an updated version of the patch I've sent two days ago, that one did not apply cleanly

drivers/staging/rtl8188eu/hal/fw.c +5 -5
@@ -154,9 +154,8 @@ static int _rtl88e_fw_free_to_go(struct adapter *adapt)
 			break;
 	} while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
-	if (counter >= POLLING_READY_TIMEOUT_COUNT) {
+	if (counter >= POLLING_READY_TIMEOUT_COUNT)
 		goto exit;
-	}
 
 	value32 = usb_read32(adapt, REG_MCUFWDL);
 	value32 |= MCUFWDL_RDY;
@@ -193,13 +192,13 @@ int rtl88eu_download_fw(struct adapter *adapt)
 	u32 fwsize;
 	int err;
 
-	if (request_firmware(&fw, fw_name, device)){
+	if (request_firmware(&fw, fw_name, device)) {
 		dev_err(device, "Firmware %s not available\n", fw_name);
 		return -ENOENT;
 	}
 
 	if (fw->size > FW_8188E_SIZE) {
-		dev_err(device,"Firmware size exceed 0x%X. Check it.\n",
+		dev_err(device, "Firmware size exceed 0x%X. Check it.\n",
 			 FW_8188E_SIZE);
 		return -1;
 	}
@@ -226,7 +225,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, pfwdata, fwsize);
 	_rtl88e_enable_fw_download(adapt, false);

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Signature · 2 lines
Regards,
Denis
#2 lore raw

you are right, would be wise to do that, added

Quoted 63 lines · On Thu, 9 Oct 2014 10:32:37 +0400 Denis Kirjanov <[email protected]> wrote:

But you haven't CCed people in the CC list

Quoted 60 lines · Igor Bogomazov

checkpatch.pl tiny fix
get rid of 2 warnings and 2 errors for hal/fw.c

Cc Greg Kroah-Hartman <[email protected]>
Cc navin patidar <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
for linux-next 3.17.0

this is an updated version of the patch I've sent two days ago, that one did not apply cleanly

drivers/staging/rtl8188eu/hal/fw.c +5 -5
@@ -154,9 +154,8 @@ static int _rtl88e_fw_free_to_go(struct adapter *adapt)
 			break;
 	} while (counter++ < POLLING_READY_TIMEOUT_COUNT);
 
-	if (counter >= POLLING_READY_TIMEOUT_COUNT) {
+	if (counter >= POLLING_READY_TIMEOUT_COUNT)
 		goto exit;
-	}
 
 	value32 = usb_read32(adapt, REG_MCUFWDL);
 	value32 |= MCUFWDL_RDY;
@@ -193,13 +192,13 @@ int rtl88eu_download_fw(struct adapter *adapt)
 	u32 fwsize;
 	int err;
 
-	if (request_firmware(&fw, fw_name, device)){
+	if (request_firmware(&fw, fw_name, device)) {
 		dev_err(device, "Firmware %s not available\n", fw_name);
 		return -ENOENT;
 	}
 
 	if (fw->size > FW_8188E_SIZE) {
-		dev_err(device,"Firmware size exceed 0x%X. Check it.\n",
+		dev_err(device, "Firmware size exceed 0x%X. Check it.\n",
 			 FW_8188E_SIZE);
 		return -1;
 	}
@@ -226,7 +225,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, pfwdata, fwsize);
 	_rtl88e_enable_fw_download(adapt, false);

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Signature · 4 lines
Sincerely yours,

Igor Bogomazov
Saint-Petersburg, Russia
maintainer
#3 lore raw
In reply to Igor Bogomazov
Quoted 2 lines · Igor Bogomazov

checkpatch.pl tiny fix
get rid of 2 warnings and 2 errors for hal/fw.c

What warnings? What errors? Be specific please.

Quoted 1 line

Trailing whitespace :(