Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: sdhci: milbeaut: 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-4-nsaenzjulienne@suse.de
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Nicolas Saenz Julienne and committed by
Ulf Hansson
d2abc6e2 c2c5252c

+1 -12
+1 -12
drivers/mmc/host/sdhci-milbeaut.c
··· 121 121 } 122 122 } 123 123 124 - static void sdhci_milbeaut_set_power(struct sdhci_host *host, 125 - unsigned char mode, unsigned short vdd) 126 - { 127 - if (!IS_ERR(host->mmc->supply.vmmc)) { 128 - struct mmc_host *mmc = host->mmc; 129 - 130 - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); 131 - } 132 - sdhci_set_power_noreg(host, mode, vdd); 133 - } 134 - 135 124 static const struct sdhci_ops sdhci_milbeaut_ops = { 136 125 .voltage_switch = sdhci_milbeaut_soft_voltage_switch, 137 126 .get_min_clock = sdhci_milbeaut_get_min_clock, ··· 128 139 .set_clock = sdhci_set_clock, 129 140 .set_bus_width = sdhci_set_bus_width, 130 141 .set_uhs_signaling = sdhci_set_uhs_signaling, 131 - .set_power = sdhci_milbeaut_set_power, 142 + .set_power = sdhci_set_power_and_bus_voltage, 132 143 }; 133 144 134 145 static void sdhci_milbeaut_bridge_reset(struct sdhci_host *host,