[PATCH 1/2] staging: rts5208: Rewrite redundant if statement to improve code style

[Tobias Nießen]

This commit uses the fact that

    if (a) {
            if (b) {
                    ...
            }
    }

can instead be written as

    if (a && b) {
            ...
    }

without any change in behavior, allowing to decrease the indentation
of the contained code block and thus reducing the average line length.

Signed-off-by: Tobias Nießen <tobias.nies...@stud.uni-hannover.de>
Signed-off-by: Sabrina Gaube <sabrina-ga...@web.de>
---
 drivers/staging/rts5208/sd.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rts5208/sd.c b/drivers/staging/rts5208/sd.c
index b3f829ed1019..a06045344301 100644
--- a/drivers/staging/rts5208/sd.c
+++ b/drivers/staging/rts5208/sd.c
@@ -4507,20 +4507,19 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct 
rtsx_chip *chip)
                        sd_lock_state, sd_card->sd_lock_status);
                if (sd_lock_state ^ (sd_card->sd_lock_status & SD_LOCKED)) {
                        sd_card->sd_lock_notify = 1;
-                       if (sd_lock_state) {
-                               if (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;
-                                               }
+                       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);
                                }
+
+                               sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | 
SD_SDR_RST);
                        }
                }
        }
-- 
2.17.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel