Commit 2c52e002 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: simplify usage of mmc_regulator_set_ocr 



After 087592395a96 ("mmc: core: Allow invalid regulator in
mmc_regulator_set_ocr()") we can remove the checks here.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/858a592b-ebf4-99b4-74fc-21b4ad3382f8@gmail.com


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

drivers/mmc/host/meson-gx-mmc.c

+2 −4
Original line number Diff line number Diff line
@@ -604,7 +604,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	 */

	switch (ios->power_mode) {

	case MMC_POWER_OFF:

		if (!IS_ERR(mmc->supply.vmmc))

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);



		if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) {
@@ -615,7 +614,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		break;



	case MMC_POWER_UP:

		if (!IS_ERR(mmc->supply.vmmc))

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);



		break;