mmc: sdhci: Remove ->select_drive_strength() callback

Drivers can use the host operation directly, so remove this now unused
callback.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Ludovic Desroches <ludovic.desroches@microchip.com>

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 351920f..5c62020 100644 (file)
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -36,10 +36,6 @@
 static int sdhci_pci_enable_dma(struct sdhci_host *host);
 static void sdhci_pci_set_bus_width(struct sdhci_host *host, int width);
 static void sdhci_pci_hw_reset(struct sdhci_host *host);
-static int sdhci_pci_select_drive_strength(struct sdhci_host *host,
-                                          struct mmc_card *card,
-                                          unsigned int max_dtr, int host_drv,
-                                          int card_drv, int *drv_type);
 
 /*****************************************************************************\
  *                                                                           *
@@ -514,7 +510,6 @@ static const struct sdhci_ops sdhci_intel_byt_ops = {
        .reset                  = sdhci_reset,
        .set_uhs_signaling      = sdhci_set_uhs_signaling,
        .hw_reset               = sdhci_pci_hw_reset,
-       .select_drive_strength  = sdhci_pci_select_drive_strength,
 };
 
 static const struct sdhci_pci_fixes sdhci_intel_byt_emmc = {
@@ -1658,20 +1653,6 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host)
                slot->hw_reset(host);
 }
 
-static int sdhci_pci_select_drive_strength(struct sdhci_host *host,
-                                          struct mmc_card *card,
-                                          unsigned int max_dtr, int host_drv,
-                                          int card_drv, int *drv_type)
-{
-       struct sdhci_pci_slot *slot = sdhci_priv(host);
-
-       if (!slot->select_drive_strength)
-               return 0;
-
-       return slot->select_drive_strength(host, card, max_dtr, host_drv,
-                                          card_drv, drv_type);
-}
-
 static const struct sdhci_ops sdhci_pci_ops = {
        .set_clock      = sdhci_set_clock,
        .enable_dma     = sdhci_pci_enable_dma,
@@ -1679,7 +1660,6 @@ static const struct sdhci_ops sdhci_pci_ops = {
        .reset          = sdhci_reset,
        .set_uhs_signaling = sdhci_set_uhs_signaling,
        .hw_reset               = sdhci_pci_hw_reset,
-       .select_drive_strength  = sdhci_pci_select_drive_strength,
 };
 
 /*****************************************************************************\

diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h
index cfe519c..da7b950 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.h
+++ b/drivers/mmc/host/sdhci-pci.h
@@ -86,10 +86,6 @@ struct sdhci_pci_slot {
        bool                    cd_override_level;
 
        void (*hw_reset)(struct sdhci_host *host);
-       int (*select_drive_strength)(struct sdhci_host *host,
-                                    struct mmc_card *card,
-                                    unsigned int max_dtr, int host_drv,
-                                    int card_drv, int *drv_type);
        unsigned long           private[0] ____cacheline_aligned;
 };
 

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 105f444..e055bd3 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2182,19 +2182,6 @@ out_unlock:
 }
 EXPORT_SYMBOL_GPL(sdhci_execute_tuning);
 
-static int sdhci_select_drive_strength(struct mmc_card *card,
-                                      unsigned int max_dtr, int host_drv,
-                                      int card_drv, int *drv_type)
-{
-       struct sdhci_host *host = mmc_priv(card->host);
-
-       if (!host->ops->select_drive_strength)
-               return 0;
-
-       return host->ops->select_drive_strength(host, card, max_dtr, host_drv,
-                                               card_drv, drv_type);
-}
-
 static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable)
 {
        /* Host Controller v3.00 defines preset value registers */
@@ -2308,7 +2295,6 @@ static const struct mmc_host_ops sdhci_ops = {
        .start_signal_voltage_switch    = sdhci_start_signal_voltage_switch,
        .prepare_hs400_tuning           = sdhci_prepare_hs400_tuning,
        .execute_tuning                 = sdhci_execute_tuning,
-       .select_drive_strength          = sdhci_select_drive_strength,
        .card_event                     = sdhci_card_event,
        .card_busy      = sdhci_card_busy,
 };

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index edf3adf..6777267 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -562,10 +562,6 @@ struct sdhci_ops {
        void    (*adma_workaround)(struct sdhci_host *host, u32 intmask);
        void    (*card_event)(struct sdhci_host *host);
        void    (*voltage_switch)(struct sdhci_host *host);
-       int     (*select_drive_strength)(struct sdhci_host *host,
-                                        struct mmc_card *card,
-                                        unsigned int max_dtr, int host_drv,
-                                        int card_drv, int *drv_type);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS