@@ -1807,7 +1807,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req)
unsigned int timeout = mmc_blk_data_timeout_ms(card->host, &brq->data);
int err;
- mmc_retune_hold_now(card->host);
+ mmc_host_retune_hold_now(card->host);
mmc_blk_send_stop(card, timeout);
@@ -2266,7 +2266,7 @@ void mmc_blk_mq_recovery(struct mmc_queue *mq)
mq->rw_wait = false;
if (mmc_blk_rq_error(&mqrq->brq)) {
- mmc_retune_hold_now(host);
+ mmc_host_retune_hold_now(host);
mmc_blk_mq_rw_recovery(mq, req);
}
@@ -544,7 +544,7 @@ int mmc_cqe_recovery(struct mmc_host *host)
struct mmc_command cmd;
int err;
- mmc_retune_hold_now(host);
+ mmc_host_retune_hold_now(host);
/*
* Recovery is expected seldom, if at all, but it reduces performance,
@@ -27,7 +27,7 @@ static inline void mmc_host_retune_clear(struct mmc_host *host)
host->need_retune = 0;
}
-static inline void mmc_retune_hold_now(struct mmc_host *host)
+static inline void mmc_host_retune_hold_now(struct mmc_host *host)
{
host->retune_now = 0;
host->hold_retune += 1;
@@ -1096,7 +1096,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
* need to hold retuning, because tuning only supprt
* 4-bit mode or 8 bit mode.
*/
- mmc_retune_hold_now(host);
+ mmc_host_retune_hold_now(host);
err = sdio_enable_4bit_bus(host->card);
mmc_host_retune_release(host);
}
@@ -793,7 +793,7 @@ EXPORT_SYMBOL_GPL(sdio_retune_crc_enable);
*/
void sdio_retune_hold_now(struct sdio_func *func)
{
- mmc_retune_hold_now(func->card->host);
+ mmc_host_retune_hold_now(func->card->host);
}
EXPORT_SYMBOL_GPL(sdio_retune_hold_now);
mmc_* functions sometimes relate to the card and sometimes to the host. Make it obvious by renaming this function to include 'host'. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/mmc/core/block.c | 4 ++-- drivers/mmc/core/core.c | 2 +- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/sdio.c | 2 +- drivers/mmc/core/sdio_io.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)