[PATCH] mmc-core: One check less in mmc_select_hs200() after error detection

SF Markus Elfring
2015-12-29T19:50:17Z

Date: Tue, 29 Dec 2015 20:28:46 +0100

This issue was detected by using the Coccinelle software.

Move the jump label directly before the desired log statement
so that the variable "err" will not be checked once more
after it was determined that a call of the function
"__mmc_set_signal_voltage" or "__mmc_switch" failed.
Use the identifier "report_failure" instead of the label "err".

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/mmc/core/mmc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 549c56e..866f72b 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1256,7 +1256,7 @@ static int mmc_select_hs200(struct mmc_card *card)

/* If fails try again during next card power cycle */
if (err)
- goto err;
+ goto report_failure;

mmc_select_driver_type(card);

@@ -1276,7 +1276,7 @@ static int mmc_select_hs200(struct mmc_card *card)
card->ext_csd.generic_cmd6_time,
true, send_status, true);
if (err)
- goto err;
+ goto report_failure;
old_timing = host->ios.timing;
mmc_set_timing(host, MMC_TIMING_MMC_HS200);
if (!send_status) {
@@ -1289,10 +1289,11 @@ static int mmc_select_hs200(struct mmc_card *card)
mmc_set_timing(host, old_timing);
}
}
-err:
- if (err)
+ if (err) {
+report_failure:
pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host),
__func__, err);
+ }
return err;
}

--
2.6.3