mmc: core: change __mmc_poll_for_busy() parameter type

This patch changes the __mmc_poll_for_busy() first parameter type
from 'struct mmc_card*' to 'struct mmc_host*'.
Because the function refers only 'struct mmc_host' to get hostname.

Signed-off-by: Huijin Park <huijin.park@samsung.com>
Link: https://lore.kernel.org/r/20211104063231.2115-2-huijin.park@samsung.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 90e1bcd03b46c0693c01f1aa1829ef693b8f2da7..2483cfdd30ea8634934d36499ce0f4bfa396ced3 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1908,8 +1908,8 @@ static int mmc_blk_card_busy(struct mmc_card *card, struct request *req)
 
        cb_data.card = card;
        cb_data.status = 0;
-       err = __mmc_poll_for_busy(card, MMC_BLK_TIMEOUT_MS, &mmc_blk_busy_cb,
-                                 &cb_data);
+       err = __mmc_poll_for_busy(card->host, MMC_BLK_TIMEOUT_MS,
+                                 &mmc_blk_busy_cb, &cb_data);
 
        /*
         * Do not assume data transferred correctly if there are any error bits

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index b1c1716dacf0eb5b663736080d80be32311434e3..bbbbcaf70a5951c14147cd985a690371d9369ce0 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1962,7 +1962,7 @@ static int mmc_sleep(struct mmc_host *host)
                goto out_release;
        }
 
-       err = __mmc_poll_for_busy(card, timeout_ms, &mmc_sleep_busy_cb, host);
+       err = __mmc_poll_for_busy(host, timeout_ms, &mmc_sleep_busy_cb, host);
 
 out_release:
        mmc_retune_release(host);

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 0c54858e89c06bb288a30686bbbdf77e3e3a948a..9946733a34c6d1b0222b2184ac0880ef97bacb3c 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -470,11 +470,10 @@ static int mmc_busy_cb(void *cb_data, bool *busy)
        return 0;
 }
 
-int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
+int __mmc_poll_for_busy(struct mmc_host *host, unsigned int timeout_ms,
                        int (*busy_cb)(void *cb_data, bool *busy),
                        void *cb_data)
 {
-       struct mmc_host *host = card->host;
        int err;
        unsigned long timeout;
        unsigned int udelay = 32, udelay_max = 32768;
@@ -515,13 +514,14 @@ EXPORT_SYMBOL_GPL(__mmc_poll_for_busy);
 int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
                      bool retry_crc_err, enum mmc_busy_cmd busy_cmd)
 {
+       struct mmc_host *host = card->host;
        struct mmc_busy_data cb_data;
 
        cb_data.card = card;
        cb_data.retry_crc_err = retry_crc_err;
        cb_data.busy_cmd = busy_cmd;
 
-       return __mmc_poll_for_busy(card, timeout_ms, &mmc_busy_cb, &cb_data);
+       return __mmc_poll_for_busy(host, timeout_ms, &mmc_busy_cb, &cb_data);
 }
 EXPORT_SYMBOL_GPL(mmc_poll_for_busy);
 

diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index e5e94567a9a9ee07e8925fdd5832e4a50bbce120..9c813b851d0b12dee2aac6afdfa439dce57b7be3 100644 (file)
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -41,7 +41,7 @@ int mmc_can_ext_csd(struct mmc_card *card);
 int mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);
 bool mmc_prepare_busy_cmd(struct mmc_host *host, struct mmc_command *cmd,
                          unsigned int timeout_ms);
-int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
+int __mmc_poll_for_busy(struct mmc_host *host, unsigned int timeout_ms,
                        int (*busy_cb)(void *cb_data, bool *busy),
                        void *cb_data);
 int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c9db24e16af135a2eff92ade5a4a22362c480449..45f5787939805dd75d4ba84a944368f68632e5ec 100644 (file)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1666,7 +1666,7 @@ static int sd_poweroff_notify(struct mmc_card *card)
 
        cb_data.card = card;
        cb_data.reg_buf = reg_buf;
-       err = __mmc_poll_for_busy(card, SD_POWEROFF_NOTIFY_TIMEOUT_MS,
+       err = __mmc_poll_for_busy(card->host, SD_POWEROFF_NOTIFY_TIMEOUT_MS,
                                  &sd_busy_poweroff_notify_cb, &cb_data);
 
 out: