staging: rts5208: Clean up coding style in rtsx_chip.c to get rid of checkpatch.pl warnings

PATCH Superseded Giedrius Statkevicius 2 participants 2 messages Oct 1, 2014 – Oct 2, 2014 Staging

Share & tools

Giedrius Statkevicius

author

2014-10-01 22:12 UTC #0 lore raw

PATCH 1/1 staging: rts5208: Clean up coding style in rtsx_chip.c to get rid of checkpatch.pl warnings

Fix 10 occurences of coding style errors where the line exceeds 80 characters by breaking them into more lines. Checkpatch.pl reports these errors as: 'WARNING: line over 80 characters'
Also, removes unnecessary returns in two void functions by removing the return statements. Checkpatch.pl reports these errors as: 'WARNING: void function return statements are not generally useful'

Patch is against Greg KH's staging-next tree.

Signed-off-by Giedrius Statkevicius <[email protected]>

---
 drivers/staging/rts5208/rtsx_chip.c | 40 ++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 14 deletions(-)

drivers/staging/rts5208/rtsx_chip.c +26 ~~-14~~

index 1411471..d604341 100644
@@ -291,7 +291,9 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
 		if (chip->dynamic_aspm) {
 			if (CHK_SDIO_EXIST(chip)) {
 				if (CHECK_PID(chip, 0x5288)) {
-					retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
+					retval = rtsx_write_cfg_dw(chip, 2,
+							0xC0, 0xFF,
+							chip->aspm_l0s_l1_en);
 					if (retval != STATUS_SUCCESS)
 						TRACE_RET(chip, STATUS_FAIL);
 				}

@@ -310,9 +312,13 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
 			if (CHK_SDIO_EXIST(chip)) {
 				chip->aspm_level[1] = chip->aspm_l0s_l1_en;
 				if (CHECK_PID(chip, 0x5288))
-					retval = rtsx_write_cfg_dw(chip, 2, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
+					retval = rtsx_write_cfg_dw(chip, 2,
+							0xC0, 0xFF,
+							chip->aspm_l0s_l1_en);
 				else
-					retval = rtsx_write_cfg_dw(chip, 1, 0xC0, 0xFF, chip->aspm_l0s_l1_en);
+					retval = rtsx_write_cfg_dw(chip, 1,
+							0xC0, 0xFF,
+							chip->aspm_l0s_l1_en);
 
 				if (retval != STATUS_SUCCESS)
 					TRACE_RET(chip, STATUS_FAIL);

@@ -966,7 +972,8 @@ void rtsx_polling_func(struct rtsx_chip *chip)
 					dev_dbg(rtsx_dev(chip), "SDIO enter ASPM!\n");
 					rtsx_write_register(chip,
 						ASPM_FORCE_CTL, 0xFC,
-						0x30 | (chip->aspm_level[1] << 2));
+						0x30 |
+						(chip->aspm_level[1] << 2));
 					chip->sdio_aspm = 1;
 				}
 			}

@@ -988,8 +995,10 @@ void rtsx_polling_func(struct rtsx_chip *chip)
 
 			turn_off_led(chip, LED_GPIO);
 
-			if (chip->auto_power_down && !chip->card_ready && !chip->sd_io)
-				rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
+			if (chip->auto_power_down && !chip->card_ready &&
+					!chip->sd_io)
+				rtsx_force_power_down(chip,
+						SSC_PDCTL | OC_PDCTL);
 
 		}
 	}

@@ -1081,7 +1090,9 @@ Delink_Stage:
 					dev_dbg(rtsx_dev(chip), "False card inserted, do force delink\n");
 
 					if (enter_L1)
-						rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 1);
+						rtsx_write_register(chip,
+							      HOST_SLEEP_STATE,
+							      0x03, 1);
 
 					rtsx_write_register(chip,
 							CHANGE_LINK_STATE, 0x0A,

@@ -1090,14 +1101,19 @@ Delink_Stage:
 					if (enter_L1)
 						rtsx_enter_L1(chip);
 
-					chip->auto_delink_cnt = delink_stage3_cnt + 1;
+					chip->auto_delink_cnt =
+						delink_stage3_cnt + 1;
 				} else {
 					dev_dbg(rtsx_dev(chip), "No card inserted, do delink\n");
 
 					if (enter_L1)
-						rtsx_write_register(chip, HOST_SLEEP_STATE, 0x03, 1);
+						rtsx_write_register(chip,
+							      HOST_SLEEP_STATE,
+							      0x03, 1);
 
-					rtsx_write_register(chip, CHANGE_LINK_STATE, 0x02, 0x02);
+					rtsx_write_register(chip,
+							CHANGE_LINK_STATE, 0x02,
+							0x02);
 
 					if (enter_L1)
 						rtsx_enter_L1(chip);

@@ -1823,8 +1839,6 @@ void rtsx_enable_aspm(struct rtsx_chip *chip)
 			}
 		}
 	}
-
-	return;
 }
 
 void rtsx_disable_aspm(struct rtsx_chip *chip)

@@ -1848,8 +1862,6 @@ void rtsx_disable_aspm(struct rtsx_chip *chip)
 			wait_timeout(1);
 		}
 	}
-
-	return;
 }
 
 int rtsx_read_ppbuf(struct rtsx_chip *chip, u8 *buf, int buf_len)

Signature · 1 line

2.1.2

Dan Carpenter

2014-10-02 08:13 UTC #1 lore raw

drivers/staging/rts5208/rtsx_chip.c int rtsx_reset_chip(struct rtsx_chip *chip) · line 293

Quoted 8 lines · Giedrius Statkevicius

drivers/staging/rts5208/rtsx_chip.c +0 -0

index 1411471..d604341 100644
@@ -291,7 +291,9 @@ int rtsx_reset_chip(struct rtsx_chip *chip)
 		if (chip->dynamic_aspm) {
 			if (CHK_SDIO_EXIST(chip)) {
 				if (CHECK_PID(chip, 0x5288)) {

These two conditions can be combined and the indenting pulled in one tab.

  			if (CHK_SDIO_EXIST(chip) && CHECK_PID(chip, 0x5288)) {

}

drivers/staging/rts5208/rtsx_chip.c void rtsx_polling_func(struct rtsx_chip *chip) · line 999

Quoted 8 lines

drivers/staging/rts5208/rtsx_chip.c +2 -2

@@ -988,8 +995,10 @@ void rtsx_polling_func(struct rtsx_chip *chip)
 
 			turn_off_led(chip, LED_GPIO);
 
-			if (chip->auto_power_down && !chip->card_ready && !chip->sd_io)
-				rtsx_force_power_down(chip, SSC_PDCTL | OC_PDCTL);
+			if (chip->auto_power_down && !chip->card_ready &&
+					!chip->sd_io)

Line this up like this:

			if (chip->auto_power_down && !chip->card_ready &&
			    !chip->sd_io)

[tab][tab][tab][space][space][space][space]!chip->sd_io)

drivers/staging/rts5208/rtsx_chip.c void rtsx_polling_func(struct rtsx_chip *chip) · line 1004

Quoted 5 lines

drivers/staging/rts5208/rtsx_chip.c +2 -0

+				rtsx_force_power_down(chip,
+						SSC_PDCTL | OC_PDCTL);
 
 		}
 	}

regards,
dan carpenter