diff mbox series

[03/11] mmc: rename mmc_retune_hold() to mmc_host_retune_hold()

Message ID 20250425111414.2522-4-wsa+renesas@sang-engineering.com
State New
Headers show
Series mmc: rename mmc_retune_* to mmc_host_retune_* | expand

Commit Message

Wolfram Sang April 25, 2025, 11:13 a.m. UTC 
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    | 4 ++--
 drivers/mmc/core/host.c    | 4 ++--
 drivers/mmc/core/host.h    | 2 +-
 drivers/mmc/core/mmc.c     | 2 +-
 drivers/mmc/core/mmc_ops.c | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index faa935ba30f0..5626444ec5a2 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -340,7 +340,7 @@  int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 
 	init_completion(&mrq->cmd_completion);
 
-	mmc_retune_hold(host);
+	mmc_host_retune_hold(host);
 
 	if (mmc_card_removed(host->card))
 		return -ENOMEDIUM;
@@ -1612,7 +1612,7 @@  static int mmc_do_erase(struct mmc_card *card, sector_t from,
 	bool use_r1b_resp;
 	int err;
 
-	mmc_retune_hold(card->host);
+	mmc_host_retune_hold(card->host);
 
 	/*
 	 * qty is used to calculate the erase timeout which depends on how many
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index b0d261bd54b8..d4cb207dcdac 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -123,7 +123,7 @@  void mmc_retune_pause(struct mmc_host *host)
 {
 	if (!host->retune_paused) {
 		host->retune_paused = 1;
-		mmc_retune_hold(host);
+		mmc_host_retune_hold(host);
 	}
 }
 EXPORT_SYMBOL(mmc_retune_pause);
@@ -157,7 +157,7 @@  void mmc_retune_timer_stop(struct mmc_host *host)
 }
 EXPORT_SYMBOL(mmc_retune_timer_stop);
 
-void mmc_retune_hold(struct mmc_host *host)
+void mmc_host_retune_hold(struct mmc_host *host)
 {
 	if (!host->hold_retune)
 		host->retune_now = 1;
diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
index cf3a3894c2c8..3d8c7c9039b4 100644
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -15,7 +15,7 @@  void mmc_unregister_host_class(void);
 
 void mmc_host_retune_enable(struct mmc_host *host);
 void mmc_host_retune_disable(struct mmc_host *host);
-void mmc_retune_hold(struct mmc_host *host);
+void mmc_host_retune_hold(struct mmc_host *host);
 void mmc_retune_release(struct mmc_host *host);
 int mmc_retune(struct mmc_host *host);
 void mmc_retune_pause(struct mmc_host *host);
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 413af7cf3143..32e77f5194fa 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1977,7 +1977,7 @@  static int mmc_sleep(struct mmc_host *host)
 	int err;
 
 	/* Re-tuning can't be done once the card is deselected */
-	mmc_retune_hold(host);
+	mmc_host_retune_hold(host);
 
 	err = mmc_deselect_cards(host);
 	if (err)
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 66283825513c..bc30fd70fd99 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -610,7 +610,7 @@  int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
 	bool use_r1b_resp;
 	unsigned char old_timing = host->ios.timing;
 
-	mmc_retune_hold(host);
+	mmc_host_retune_hold(host);
 
 	if (!timeout_ms) {
 		pr_warn("%s: unspecified timeout for CMD6 - use generic\n",
@@ -989,7 +989,7 @@  void mmc_run_bkops(struct mmc_card *card)
 	    card->ext_csd.raw_bkops_status < EXT_CSD_BKOPS_LEVEL_2)
 		return;
 
-	mmc_retune_hold(card->host);
+	mmc_host_retune_hold(card->host);
 
 	/*
 	 * For urgent BKOPS status, LEVEL_2 and higher, let's execute
@@ -1056,7 +1056,7 @@  int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms)
 
 	pr_debug("%s: Sanitize in progress...\n", mmc_hostname(host));
 
-	mmc_retune_hold(host);
+	mmc_host_retune_hold(host);
 
 	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_SANITIZE_START,
 			   1, timeout_ms, 0, true, false, 0);