Commit c2c5252c authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Ulf Hansson
Browse files

mmc: sdhci: arasan: 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: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20200306174413.20634-3-nsaenzjulienne@suse.de


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6c92ae1e

drivers/mmc/host/sdhci-of-arasan.c

+2 −13
Original line number Diff line number Diff line
@@ -325,17 +325,6 @@ static int sdhci_arasan_voltage_switch(struct mmc_host *mmc, 
	return -EINVAL;

}



static void sdhci_arasan_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_arasan_ops = {

	.set_clock = sdhci_arasan_set_clock,

	.get_max_clock = sdhci_pltfm_clk_get_max_clock,
@@ -343,7 +332,7 @@ static const struct sdhci_ops sdhci_arasan_ops = { 
	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_arasan_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.set_power = sdhci_arasan_set_power,

	.set_power = sdhci_set_power_and_bus_voltage,

};



static const struct sdhci_pltfm_data sdhci_arasan_pdata = {
@@ -414,7 +403,7 @@ static const struct sdhci_ops sdhci_arasan_cqe_ops = { 
	.set_bus_width = sdhci_set_bus_width,

	.reset = sdhci_arasan_reset,

	.set_uhs_signaling = sdhci_set_uhs_signaling,

	.set_power = sdhci_arasan_set_power,

	.set_power = sdhci_set_power_and_bus_voltage,

	.irq = sdhci_arasan_cqhci_irq,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE