mmc: sdhci: am654: Use sdhci_set_power_and_voltage()

The sdhci core provides a helper function with the same functionality as
this controller's set_power() callback. Use it instead.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20200306174413.20634-8-nsaenzjulienne@suse.de
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 58183b5..061b439 100644 (file)
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -255,17 +255,6 @@ static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
        sdhci_set_clock(host, clock);
 }
 
-static void sdhci_am654_set_power(struct sdhci_host *host, unsigned char mode,
-                                 unsigned short vdd)
-{
-       if (!IS_ERR(host->mmc->supply.vmmc)) {
-               struct mmc_host *mmc = host->mmc;
-
-               mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-       }
-       sdhci_set_power_noreg(host, mode, vdd);
-}
-
 static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)
 {
        unsigned char timing = host->mmc->ios.timing;
@@ -321,7 +310,7 @@ static struct sdhci_ops sdhci_am654_ops = {
        .get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
        .set_uhs_signaling = sdhci_set_uhs_signaling,
        .set_bus_width = sdhci_set_bus_width,
-       .set_power = sdhci_am654_set_power,
+       .set_power = sdhci_set_power_and_bus_voltage,
        .set_clock = sdhci_am654_set_clock,
        .write_b = sdhci_am654_write_b,
        .irq = sdhci_am654_cqhci_irq,
@@ -344,7 +333,7 @@ static struct sdhci_ops sdhci_j721e_8bit_ops = {
        .get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
        .set_uhs_signaling = sdhci_set_uhs_signaling,
        .set_bus_width = sdhci_set_bus_width,
-       .set_power = sdhci_am654_set_power,
+       .set_power = sdhci_set_power_and_bus_voltage,
        .set_clock = sdhci_am654_set_clock,
        .write_b = sdhci_am654_write_b,
        .irq = sdhci_am654_cqhci_irq,
@@ -367,7 +356,7 @@ static struct sdhci_ops sdhci_j721e_4bit_ops = {
        .get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
        .set_uhs_signaling = sdhci_set_uhs_signaling,
        .set_bus_width = sdhci_set_bus_width,
-       .set_power = sdhci_am654_set_power,
+       .set_power = sdhci_set_power_and_bus_voltage,
        .set_clock = sdhci_j721e_4bit_set_clock,
        .write_b = sdhci_am654_write_b,
        .irq = sdhci_am654_cqhci_irq,