Commit 34a49d9e authored by Tobias Nießen's avatar Tobias Nießen Committed by Greg Kroah-Hartman

staging: rts5208: Rewrite redundant if statement to improve code style

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: default avatarTobias Nießen <tobias.niessen@stud.uni-hannover.de>
Signed-off-by: default avatarSabrina Gaube <sabrina-gaube@web.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ff9f78e
...@@ -4507,20 +4507,19 @@ int sd_execute_write_data(struct scsi_cmnd *srb, struct rtsx_chip *chip) ...@@ -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); 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; sd_card->sd_lock_notify = 1;
if (sd_lock_state) { if (sd_lock_state &&
if (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE) { (sd_card->sd_lock_status & SD_LOCK_1BIT_MODE)) {
sd_card->sd_lock_status |= ( sd_card->sd_lock_status |= (
SD_UNLOCK_POW_ON | SD_SDR_RST); SD_UNLOCK_POW_ON | SD_SDR_RST);
if (CHK_SD(sd_card)) { if (CHK_SD(sd_card)) {
retval = reset_sd(chip); retval = reset_sd(chip);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST); sd_card->sd_lock_status &= ~(SD_UNLOCK_POW_ON | SD_SDR_RST);
goto sd_execute_write_cmd_failed; 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);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment