| Message ID | 20200306174413.20634-4-nsaenzjulienne@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Raspbery Pi 4 vmmc regulator support | expand |
On 6/03/20 7:44 pm, Nicolas Saenz Julienne wrote: > 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> > --- > drivers/mmc/host/sdhci-milbeaut.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-milbeaut.c b/drivers/mmc/host/sdhci-milbeaut.c > index 92f30a1db435..4e7cc0680f94 100644 > --- a/drivers/mmc/host/sdhci-milbeaut.c > +++ b/drivers/mmc/host/sdhci-milbeaut.c > @@ -121,17 +121,6 @@ static void sdhci_milbeaut_reset(struct sdhci_host *host, u8 mask) > } > } > > -static void sdhci_milbeaut_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 const struct sdhci_ops sdhci_milbeaut_ops = { > .voltage_switch = sdhci_milbeaut_soft_voltage_switch, > .get_min_clock = sdhci_milbeaut_get_min_clock, > @@ -139,7 +128,7 @@ static const struct sdhci_ops sdhci_milbeaut_ops = { > .set_clock = sdhci_set_clock, > .set_bus_width = sdhci_set_bus_width, > .set_uhs_signaling = sdhci_set_uhs_signaling, > - .set_power = sdhci_milbeaut_set_power, > + .set_power = sdhci_set_power_and_bus_voltage, > }; > > static void sdhci_milbeaut_bridge_reset(struct sdhci_host *host, >
diff --git a/drivers/mmc/host/sdhci-milbeaut.c b/drivers/mmc/host/sdhci-milbeaut.c index 92f30a1db435..4e7cc0680f94 100644 --- a/drivers/mmc/host/sdhci-milbeaut.c +++ b/drivers/mmc/host/sdhci-milbeaut.c @@ -121,17 +121,6 @@ static void sdhci_milbeaut_reset(struct sdhci_host *host, u8 mask) } } -static void sdhci_milbeaut_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 const struct sdhci_ops sdhci_milbeaut_ops = { .voltage_switch = sdhci_milbeaut_soft_voltage_switch, .get_min_clock = sdhci_milbeaut_get_min_clock, @@ -139,7 +128,7 @@ static const struct sdhci_ops sdhci_milbeaut_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = sdhci_set_uhs_signaling, - .set_power = sdhci_milbeaut_set_power, + .set_power = sdhci_set_power_and_bus_voltage, }; static void sdhci_milbeaut_bridge_reset(struct sdhci_host *host,
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> --- drivers/mmc/host/sdhci-milbeaut.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)