mmc: rename mmc_can_gpio_ro() to mmc_host_can_gpio_ro()

mmc_can_* 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>
Link: https://lore.kernel.org/r/20250401095847.29271-12-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/slot-gpio.c b/drivers/mmc/core/slot-gpio.c
index 82a933d86889621de50ae9300f927f27b9ed4e36..c5bc6268803eb6960b779d5f785369f6c1d8b164 100644 (file)
--- a/drivers/mmc/core/slot-gpio.c
+++ b/drivers/mmc/core/slot-gpio.c
@@ -275,10 +275,10 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
 }
 EXPORT_SYMBOL(mmc_gpiod_request_ro);
 
-bool mmc_can_gpio_ro(struct mmc_host *host)
+bool mmc_host_can_gpio_ro(struct mmc_host *host)
 {
        struct mmc_gpio *ctx = host->slot.handler_priv;
 
        return ctx->ro_gpio ? true : false;
 }
-EXPORT_SYMBOL(mmc_can_gpio_ro);
+EXPORT_SYMBOL(mmc_host_can_gpio_ro);

diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index c7812523aac8b6cd825f6eb7dcea1658e3210c22..e6fa3ed4256060e390cb7fea63b02d762f176fab 100644 (file)
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -1112,7 +1112,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
                host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES);
 
        /* For some SoC, we disable internal WP. GPIO may override this */
-       if (mmc_can_gpio_ro(host->mmc))
+       if (mmc_host_can_gpio_ro(host->mmc))
                mmc_data->capabilities2 &= ~MMC_CAP2_NO_WRITE_PROTECT;
 
        /* SDR speeds are only available on Gen2+ */

diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index 26a9a8b5682af186d7c7c2576f97de7b501d5c5e..8897839ab2aa39bd17a07933f0925e55738450a0 100644 (file)
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -1270,7 +1270,7 @@ static int sdhci_omap_probe(struct platform_device *pdev)
                        mmc->f_max = 48000000;
        }
 
-       if (!mmc_can_gpio_ro(mmc))
+       if (!mmc_host_can_gpio_ro(mmc))
                mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;
 
        pltfm_host->clk = devm_clk_get(dev, "fck");

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 8afa78db72b284062c32b8611278f994d1a6c732..fd5681d1e31ff78ef2842ac173124e5c842cc05e 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2571,7 +2571,7 @@ int sdhci_get_ro(struct mmc_host *mmc)
                is_readonly = 0;
        } else if (host->ops->get_ro) {
                is_readonly = host->ops->get_ro(host);
-       } else if (mmc_can_gpio_ro(mmc)) {
+       } else if (mmc_host_can_gpio_ro(mmc)) {
                is_readonly = mmc_gpio_get_ro(mmc);
                /* Do not invert twice */
                allow_invert = !(mmc->caps2 & MMC_CAP2_RO_ACTIVE_HIGH);

diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 569b66d3d47a612dffa85c735aebd8f4eb57856d..b71241f55df57be97c5fb9c491fd489e1fe2a30a 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1176,7 +1176,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
                                  dma_max_mapping_size(&pdev->dev));
        mmc->max_seg_size = mmc->max_req_size;
 
-       if (mmc_can_gpio_ro(mmc))
+       if (mmc_host_can_gpio_ro(mmc))
                _host->ops.get_ro = mmc_gpio_get_ro;
 
        if (mmc_host_can_gpio_cd(mmc))

diff --git a/include/linux/mmc/slot-gpio.h b/include/linux/mmc/slot-gpio.h
index 4f6a46c636ec9ba16dbf0c8b081d0564b121571a..23ac5696fa3802ab797c06308fe6d88159fc4168 100644 (file)
--- a/include/linux/mmc/slot-gpio.h
+++ b/include/linux/mmc/slot-gpio.h
@@ -25,6 +25,6 @@ int mmc_gpiod_set_cd_config(struct mmc_host *host, unsigned long config);
 int mmc_gpio_set_cd_wake(struct mmc_host *host, bool on);
 void mmc_gpiod_request_cd_irq(struct mmc_host *host);
 bool mmc_host_can_gpio_cd(struct mmc_host *host);
-bool mmc_can_gpio_ro(struct mmc_host *host);
+bool mmc_host_can_gpio_ro(struct mmc_host *host);
 
 #endif