Commit 2ebbdace authored by Huijin Park's avatar Huijin Park Committed by Ulf Hansson
Browse files

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: default avatarHuijin Park <huijin.park@samsung.com>
Link: https://lore.kernel.org/r/20211104063231.2115-2-huijin.park@samsung.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 431fae8a

drivers/mmc/core/block.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mmc/core/mmc_ops.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/mmc/core/mmc_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/mmc/core/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -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: