lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rts5208: remove redundant sd30_mode checks

Browse Source 
There are two hunks of code that check if sd30_mode is true however
an earlier check in an outer code block on sd30_mode being false means
that sd30_mode can never be true at these points so these checks are
redundant.  Remove the dead code.

Addresses-Coverity: ("Logically dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20190830081047.13630-1-colin.king@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Ian King 2019-08-30 09:10:47 +01:00 committed by Greg Kroah-Hartman
parent be22bc7ceb
commit 2e63a4a4b7
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/rts5208/sd.c
View File

@ -2573,17 +2573,13 @@ static int reset_sd(struct rtsx_chip *chip)
retval = sd_sdr_tuning(chip); retval = sd_sdr_tuning(chip);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
if (sd20_mode) { retval = sd_init_power(chip);
if (retval != STATUS_SUCCESS)
goto status_fail; goto status_fail;
} else {
retval = sd_init_power(chip);
if (retval != STATUS_SUCCESS)
goto status_fail;
try_sdio = false; try_sdio = false;
sd20_mode = true; sd20_mode = true;
goto switch_fail; goto switch_fail;
}
} }
sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr, sd_send_cmd_get_rsp(chip, SEND_STATUS, sd_card->sd_addr,
@ -2598,17 +2594,13 @@ static int reset_sd(struct rtsx_chip *chip)
if (read_lba0) { if (read_lba0) {
retval = sd_read_lba0(chip); retval = sd_read_lba0(chip);
if (retval != STATUS_SUCCESS) { if (retval != STATUS_SUCCESS) {
if (sd20_mode) { retval = sd_init_power(chip);
if (retval != STATUS_SUCCESS)
goto status_fail; goto status_fail;
} else {
retval = sd_init_power(chip);
if (retval != STATUS_SUCCESS)
goto status_fail;
try_sdio = false; try_sdio = false;
sd20_mode = true; sd20_mode = true;
goto switch_fail; goto switch_fail;
}
} }
} }
} }