mmc: core: always check status after reset

Always check if the card is alive after a successful reset. This allows
us to remove mmc_hw_reset_check(), leaving mmc_hw_reset() as the only
card reset interface.

Signed-off-by: Johan Rudholm <johanru@axis.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 0a7430f94d2961a163fa647dd109b221b9d25286..7dac4695163beadb5add4817c9a13fd3abe00d4e 100644 (file)
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -2342,20 +2342,16 @@ static int mmc_test_hw_reset(struct mmc_test_card *test)
        struct mmc_host *host = card->host;
        int err;
 
-       err = mmc_hw_reset_check(host);
+       if (!mmc_card_mmc(card) || !mmc_can_reset(card))
+               return RESULT_UNSUP_CARD;
+
+       err = mmc_hw_reset(host);
        if (!err)
                return RESULT_OK;
+       else if (err == -EOPNOTSUPP)
+               return RESULT_UNSUP_HOST;
 
-       if (err == -ENOSYS)
-               return RESULT_FAIL;
-
-       if (err != -EOPNOTSUPP)
-               return err;
-
-       if (!mmc_can_reset(card))
-               return RESULT_UNSUP_CARD;
-
-       return RESULT_UNSUP_HOST;
+       return RESULT_FAIL;
 }
 
 static const struct mmc_test_case mmc_test_cases[] = {

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d3bfbdfab05212810cf8f3059bb5c948d428f866..72070f188cc579a16daf3cdb739038f8ad3821d8 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2286,9 +2286,10 @@ int mmc_can_reset(struct mmc_card *card)
 }
 EXPORT_SYMBOL(mmc_can_reset);
 
-static int mmc_do_hw_reset(struct mmc_host *host, int check)
+int mmc_hw_reset(struct mmc_host *host)
 {
        struct mmc_card *card = host->card;
+       u32 status;
 
        if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
                return -EOPNOTSUPP;
@@ -2305,13 +2306,9 @@ static int mmc_do_hw_reset(struct mmc_host *host, int check)
        host->ops->hw_reset(host);
 
        /* If the reset has happened, then a status command will fail */
-       if (check) {
-               u32 status;
-
-               if (!mmc_send_status(card, &status)) {
-                       mmc_host_clk_release(host);
-                       return -ENOSYS;
-               }
+       if (!mmc_send_status(card, &status)) {
+               mmc_host_clk_release(host);
+               return -ENOSYS;
        }
 
        /* Set initial state and call mmc_set_ios */
@@ -2321,19 +2318,8 @@ static int mmc_do_hw_reset(struct mmc_host *host, int check)
 
        return host->bus_ops->power_restore(host);
 }
-
-int mmc_hw_reset(struct mmc_host *host)
-{
-       return mmc_do_hw_reset(host, 0);
-}
 EXPORT_SYMBOL(mmc_hw_reset);
 
-int mmc_hw_reset_check(struct mmc_host *host)
-{
-       return mmc_do_hw_reset(host, 1);
-}
-EXPORT_SYMBOL(mmc_hw_reset_check);
-
 static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
 {
        host->f_init = freq;

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index cb2b0400d2840982a3a57ffb1cb51b0723b6fa85..160448f920acd443327be8fa4a2c70cd7c736134 100644 (file)
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -182,7 +182,6 @@ extern int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);
 extern int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount,
                              bool is_rel_write);
 extern int mmc_hw_reset(struct mmc_host *host);
-extern int mmc_hw_reset_check(struct mmc_host *host);
 extern int mmc_can_reset(struct mmc_card *card);
 
 extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);