[PATCH] staging: rts5208: Fixed checkpath warning.
This patch solves the following checkpatch.pl's message in drivers/staging/rts5208/rtsx_transport.c:397. WARNING: line over 80 characters + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; Signed-off-by: Prakhar Sinha --- drivers/staging/rts5208/rtsx_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c index 8277d7895608..3fc83875fe7c 100644 --- a/drivers/staging/rts5208/rtsx_transport.c +++ b/drivers/staging/rts5208/rtsx_transport.c @@ -394,7 +394,8 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *index = *index + 1; } if ((i == (sg_cnt - 1)) || !resid) - option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_END | +RTSX_SG_TRANS_DATA; else option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; -- 2.20.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: rts5208: Fixed checkpath warning.
This patch solves the following checkpatch.pl's message in drivers/staging/rts5208/rtsx_transport.c:397. WARNING: line over 80 characters + option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; Signed-off-by: Prakhar Sinha --- Changes in v2: - Re-structured assignment to solve checkpath.pl's warning. drivers/staging/rts5208/rtsx_transport.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rts5208/rtsx_transport.c b/drivers/staging/rts5208/rtsx_transport.c index 8277d7895608..e61bc7c6ac33 100644 --- a/drivers/staging/rts5208/rtsx_transport.c +++ b/drivers/staging/rts5208/rtsx_transport.c @@ -393,10 +393,9 @@ static int rtsx_transfer_sglist_adma_partial(struct rtsx_chip *chip, u8 card, *offset = 0; *index = *index + 1; } - if ((i == (sg_cnt - 1)) || !resid) - option = RTSX_SG_VALID | RTSX_SG_END | RTSX_SG_TRANS_DATA; - else - option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; + option = RTSX_SG_VALID | RTSX_SG_TRANS_DATA; + if ((i == sg_cnt - 1) || !resid) + option |= RTSX_SG_END; rtsx_add_sg_tbl(chip, (u32)addr, (u32)len, option); -- 2.20.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rts5208: Fixed checkpatch warning.
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:
+ goto
sd_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);
Signed-off-by: Prakhar Sinha
---
drivers/staging/rts5208/sd.c | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index a06045344301..7d6f2c56e740 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -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);
}
}
--
2.20.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] 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:
+ goto
sd_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);
Signed-off-by: Prakhar Sinha
---
drivers/staging/rts5208/sd.c | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index a06045344301..7d6f2c56e740 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -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);
}
}
--
2.20.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rts5208: Fix 80 char warning by re-structuring 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:
+ goto
sd_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);
Signed-off-by: Prakhar Sinha
---
drivers/staging/rts5208/sd.c | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index a06045344301..7d6f2c56e740 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -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);
}
}
--
2.20.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
