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

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>

authored by

Nicolas Saenz Julienne and committed by
Ulf Hansson
9d8acdd3 98160562

+3 -14
+3 -14
drivers/mmc/host/sdhci_am654.c
··· 255 255 sdhci_set_clock(host, clock); 256 256 } 257 257 258 - static void sdhci_am654_set_power(struct sdhci_host *host, unsigned char mode, 259 - unsigned short vdd) 260 - { 261 - if (!IS_ERR(host->mmc->supply.vmmc)) { 262 - struct mmc_host *mmc = host->mmc; 263 - 264 - mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); 265 - } 266 - sdhci_set_power_noreg(host, mode, vdd); 267 - } 268 - 269 258 static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg) 270 259 { 271 260 unsigned char timing = host->mmc->ios.timing; ··· 310 321 .get_timeout_clock = sdhci_pltfm_clk_get_max_clock, 311 322 .set_uhs_signaling = sdhci_set_uhs_signaling, 312 323 .set_bus_width = sdhci_set_bus_width, 313 - .set_power = sdhci_am654_set_power, 324 + .set_power = sdhci_set_power_and_bus_voltage, 314 325 .set_clock = sdhci_am654_set_clock, 315 326 .write_b = sdhci_am654_write_b, 316 327 .irq = sdhci_am654_cqhci_irq, ··· 333 344 .get_timeout_clock = sdhci_pltfm_clk_get_max_clock, 334 345 .set_uhs_signaling = sdhci_set_uhs_signaling, 335 346 .set_bus_width = sdhci_set_bus_width, 336 - .set_power = sdhci_am654_set_power, 347 + .set_power = sdhci_set_power_and_bus_voltage, 337 348 .set_clock = sdhci_am654_set_clock, 338 349 .write_b = sdhci_am654_write_b, 339 350 .irq = sdhci_am654_cqhci_irq, ··· 356 367 .get_timeout_clock = sdhci_pltfm_clk_get_max_clock, 357 368 .set_uhs_signaling = sdhci_set_uhs_signaling, 358 369 .set_bus_width = sdhci_set_bus_width, 359 - .set_power = sdhci_am654_set_power, 370 + .set_power = sdhci_set_power_and_bus_voltage, 360 371 .set_clock = sdhci_j721e_4bit_set_clock, 361 372 .write_b = sdhci_am654_write_b, 362 373 .irq = sdhci_am654_cqhci_irq,