mmc: improve API to make clear hw_reset callback is for cards

To make it unambiguous that the hw_reset callback is for cards and not
for controllers, we add 'card' to the callback name and convert all
users in one go. We keep the argument as mmc_host, though, because the
callback is used very early when mmc_card is not yet populated.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220408080045.6497-4-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 06a9bc97be2a036f823e5912f64105764859a5ec..4b70cbfc6d5de0cb81d13d16a879f80b0d617a2b 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1988,9 +1988,9 @@ static void mmc_hw_reset_for_init(struct mmc_host *host)
 {
        mmc_pwrseq_reset(host);
 
-       if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
+       if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->card_hw_reset)
                return;
-       host->ops->hw_reset(host);
+       host->ops->card_hw_reset(host);
 }
 
 /**

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e7ea45386c22f7e1880a521a281397893a3a6612..5d8d9f72476fb2c6341efd16fd0f9ba1008b9c8e 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -2225,11 +2225,11 @@ static int _mmc_hw_reset(struct mmc_host *host)
         */
        _mmc_flush_cache(host);
 
-       if ((host->caps & MMC_CAP_HW_RESET) && host->ops->hw_reset &&
+       if ((host->caps & MMC_CAP_HW_RESET) && host->ops->card_hw_reset &&
             mmc_can_reset(card)) {
                /* If the card accept RST_n signal, send it. */
                mmc_set_clock(host, host->f_init);
-               host->ops->hw_reset(host);
+               host->ops->card_hw_reset(host);
                /* Set initial state and call mmc_set_ios */
                mmc_set_initial_state(host);
        } else {

diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 463b707d9e9973440eac556d8b9c6812696cb9f9..641ab4f42125bf6e2bbe39656109b548d2eeb83b 100644 (file)
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -1259,7 +1259,7 @@ static void bcm2835_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 static const struct mmc_host_ops bcm2835_ops = {
        .request = bcm2835_request,
        .set_ios = bcm2835_set_ios,
-       .hw_reset = bcm2835_reset,
+       .card_hw_reset = bcm2835_reset,
 };
 
 static int bcm2835_add_host(struct bcm2835_host *host)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 06dc56cbada879783d411cf047a97eaa3254b172..581614196a8413317c651e9d405a891e2c102add 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1812,7 +1812,7 @@ static const struct mmc_host_ops dw_mci_ops = {
        .set_ios                = dw_mci_set_ios,
        .get_ro                 = dw_mci_get_ro,
        .get_cd                 = dw_mci_get_cd,
-       .hw_reset               = dw_mci_hw_reset,
+       .card_hw_reset          = dw_mci_hw_reset,
        .enable_sdio_irq        = dw_mci_enable_sdio_irq,
        .ack_sdio_irq           = dw_mci_ack_sdio_irq,
        .execute_tuning         = dw_mci_execute_tuning,

diff --git a/drivers/mmc/host/meson-mx-sdhc-mmc.c b/drivers/mmc/host/meson-mx-sdhc-mmc.c
index 28aa78aa08f3f2752d3da3b2db2a51e98ab80e6a..e92e63cb5641cf30beb9d076d8cff3609373cd9f 100644 (file)
--- a/drivers/mmc/host/meson-mx-sdhc-mmc.c
+++ b/drivers/mmc/host/meson-mx-sdhc-mmc.c
@@ -511,7 +511,7 @@ static int meson_mx_sdhc_execute_tuning(struct mmc_host *mmc, u32 opcode)
 }
 
 static const struct mmc_host_ops meson_mx_sdhc_ops = {
-       .hw_reset                       = meson_mx_sdhc_hw_reset,
+       .card_hw_reset                  = meson_mx_sdhc_hw_reset,
        .request                        = meson_mx_sdhc_request,
        .set_ios                        = meson_mx_sdhc_set_ios,
        .card_busy                      = meson_mx_sdhc_card_busy,

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index e61b0b98065a250866097168e4a3fcb5a43073d7..195dc897188b9cb20d083b446ef4c579fd164891 100644 (file)
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -2458,7 +2458,7 @@ static const struct mmc_host_ops mt_msdc_ops = {
        .execute_tuning = msdc_execute_tuning,
        .prepare_hs400_tuning = msdc_prepare_hs400_tuning,
        .execute_hs400_tuning = msdc_execute_hs400_tuning,
-       .hw_reset = msdc_hw_reset,
+       .card_hw_reset = msdc_hw_reset,
 };
 
 static const struct cqhci_host_ops msdc_cmdq_ops = {

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 07c6da1f2f0fe7b38414ab0afa273c3f912ec20e..22152029e14c5b78fe12a8199a48e31e6907a0d8 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2999,7 +2999,7 @@ static const struct mmc_host_ops sdhci_ops = {
        .set_ios        = sdhci_set_ios,
        .get_cd         = sdhci_get_cd,
        .get_ro         = sdhci_get_ro,
-       .hw_reset       = sdhci_hw_reset,
+       .card_hw_reset  = sdhci_hw_reset,
        .enable_sdio_irq = sdhci_enable_sdio_irq,
        .ack_sdio_irq    = sdhci_ack_sdio_irq,
        .start_signal_voltage_switch    = sdhci_start_signal_voltage_switch,

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index c62afd21269256bbc1f67e5e54d6acae92268a20..0e8fbf4957d8ce8fa3944dc7f75bd7ad23d5ea9f 100644 (file)
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1115,7 +1115,7 @@ static const struct mmc_host_ops sunxi_mmc_ops = {
        .get_cd          = mmc_gpio_get_cd,
        .enable_sdio_irq = sunxi_mmc_enable_sdio_irq,
        .start_signal_voltage_switch = sunxi_mmc_volt_switch,
-       .hw_reset        = sunxi_mmc_hw_reset,
+       .card_hw_reset   = sunxi_mmc_hw_reset,
        .card_busy       = sunxi_mmc_card_busy,
 };
 

diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c
index ccbf9885a52bec98f3cc6f5615b7b1b43220888f..3a8defdcca77226ab80307d5058a0169a573997e 100644 (file)
--- a/drivers/mmc/host/uniphier-sd.c
+++ b/drivers/mmc/host/uniphier-sd.c
@@ -597,7 +597,7 @@ static int uniphier_sd_probe(struct platform_device *pdev)
                        ret = PTR_ERR(priv->rst_hw);
                        goto free_host;
                }
-               host->ops.hw_reset = uniphier_sd_hw_reset;
+               host->ops.card_hw_reset = uniphier_sd_hw_reset;
        }
 
        if (host->mmc->caps & MMC_CAP_UHS) {

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 7afb57cab00b791e492428539dfd82fd2da65969..c193c50ccd785e4cf064311352728f8a60664b42 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -181,7 +181,7 @@ struct mmc_host_ops {
                                         unsigned int max_dtr, int host_drv,
                                         int card_drv, int *drv_type);
        /* Reset the eMMC card via RST_n */
-       void    (*hw_reset)(struct mmc_host *host);
+       void    (*card_hw_reset)(struct mmc_host *host);
        void    (*card_event)(struct mmc_host *host);
 
        /*