@@ -988,7 +988,7 @@ void mmc_set_initial_state(struct mmc_host *host)
if (host->cqe_on)
host->cqe_ops->cqe_off(host);
- mmc_retune_disable(host);
+ mmc_host_retune_disable(host);
if (mmc_host_is_spi(host))
host->ios.chip_select = MMC_CS_HIGH;
@@ -138,12 +138,12 @@ void mmc_retune_unpause(struct mmc_host *host)
EXPORT_SYMBOL(mmc_retune_unpause);
/**
- * mmc_retune_disable() - exit a transfer mode that requires retuning
+ * mmc_host_retune_disable() - exit a transfer mode that requires retuning
* @host: host which should not retune anymore
*
* It is not meant for temporarily preventing retuning!
*/
-void mmc_retune_disable(struct mmc_host *host)
+void mmc_host_retune_disable(struct mmc_host *host)
{
mmc_retune_unpause(host);
host->can_retune = 0;
@@ -14,7 +14,7 @@ int mmc_register_host_class(void);
void mmc_unregister_host_class(void);
void mmc_host_retune_enable(struct mmc_host *host);
-void mmc_retune_disable(struct mmc_host *host);
+void mmc_host_retune_disable(struct mmc_host *host);
void mmc_retune_hold(struct mmc_host *host);
void mmc_retune_release(struct mmc_host *host);
int mmc_retune(struct mmc_host *host);
@@ -1238,7 +1238,7 @@ static int mmc_select_hs400(struct mmc_card *card)
mmc_set_bus_speed(card);
if (host->ops->execute_hs400_tuning) {
- mmc_retune_disable(host);
+ mmc_host_retune_disable(host);
err = host->ops->execute_hs400_tuning(host, card);
mmc_host_retune_enable(host);
if (err)
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/core.c | 2 +- drivers/mmc/core/host.c | 4 ++-- drivers/mmc/core/host.h | 2 +- drivers/mmc/core/mmc.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)