staging: rts5208: Modified nested if blocks.
PATCH 1/1 staging: rts5208: Modified nested if blocks.
This patch solves the following checkpatch.pl's messages in drivers/staging/rts5208/sd.c
WARNING: line over 80 characters
4517: FILE: drivers/staging/rts5208/sd.c:4517:
+ sd_card->sd_lock_status &=
~(SD_UNLOCK_POW_ON | SD_SDR_RST);
WARNING: line over 80 characters
4518: FILE: drivers/staging/rts5208/sd.c:4518:
+ gotosd_execute_write_cmd_failed;
WARNING: line over 80 characters
4522: FILE: drivers/staging/rts5208/sd.c:4522:
+ sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |SD_SDR_RST);
--- drivers/staging/rts5208/sd.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/staging/rts5208/sd.c +12 -14
@@ -4505,22 +4505,20 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip)dev_dbg (rtsx_dev (chip),"sd_lock_state = 0x%x, sd_card->sd_lock_status = 0x%x\n" , sd_lock_state, sd_card->sd_lock_status); -if (sd_lock_state ^ (sd_card->sd_lock_status &SD_LOCKED )) { +if (sd_lock_state ^ (sd_card->sd_lock_status &SD_LOCKED )) sd_card->sd_lock_notify =1 ; -if (sd_lock_state && - (sd_card->sd_lock_status &SD_LOCK_1BIT_MODE )) { - sd_card->sd_lock_status |= ( -SD_UNLOCK_POW_ON |SD_SDR_RST ); -if (CHK_SD (sd_card)) { - retval =reset_sd (chip); -if (retval !=STATUS_SUCCESS ) { - sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |SD_SDR_RST ); - goto sd_execute_write_cmd_failed; - } - } - - sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON |SD_SDR_RST ); +if ((sd_lock_state & !(sd_card->sd_lock_status &SD_LOCKED )) && + (sd_card->sd_lock_status &SD_LOCK_1BIT_MODE )) { + sd_card->sd_lock_status |= (SD_UNLOCK_POW_ON | +SD_SDR_RST ); +if (CHK_SD (sd_card) && +reset_sd (chip) !=STATUS_SUCCESS ) { + sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | +SD_SDR_RST ); + goto sd_execute_write_cmd_failed; } + sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | +SD_SDR_RST ); } }
Signature · 1 line
2.20.1
Greg KH
maintainerQuoted 8 lines · Prakhar Sinha
This patch solves the following checkpatch.pl's messages in
drivers/staging/rts5208/sd.cWARNING: line over 80 characters
4517: FILE:drivers/staging/rts5208/sd.c:4517:
+sd_card->sd_lock_status&=
~(SD_UNLOCK_POW_ON |SD_SDR_RST);
Quoted 4 lines
WARNING: line over 80 characters
4518: FILE:drivers/staging/rts5208/sd.c:4518:
+ gotosd_execute_write_cmd_failed;
Please keep the full line without wrapping them in these messages.
And your subject is a big odd, look at the documentation for how to create a good subject line.
thanks,
greg k-h