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

mmc: meson-gx: use new helpers mmc_regulator_enable/disable_vqmmc 



Use new helpers mmc_regulator_enable/disable_vqmmc to simplify
the code.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/2ceb62da-07e6-bafc-c29e-13cc1cdde93a@gmail.com


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

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

+2 −16
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ struct meson_host { 


	int irq;



	bool vqmmc_enabled;

	bool needs_pre_post_req;



	spinlock_t lock;
@@ -605,11 +604,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	switch (ios->power_mode) {

	case MMC_POWER_OFF:

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



		if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) {

			regulator_disable(mmc->supply.vqmmc);

			host->vqmmc_enabled = false;

		}

		mmc_regulator_disable_vqmmc(mmc);



		break;
@@ -619,15 +614,7 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		break;



	case MMC_POWER_ON:

		if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) {

			int ret = regulator_enable(mmc->supply.vqmmc);



			if (ret < 0)

				dev_err(host->dev,

					"failed to enable vqmmc regulator\n");

			else

				host->vqmmc_enabled = true;

		}

		mmc_regulator_enable_vqmmc(mmc);



		break;

	}
@@ -1179,7 +1166,6 @@ static int meson_mmc_probe(struct platform_device *pdev) 
					"amlogic,dram-access-quirk");



	/* Get regulators and the supported OCR mask */

	host->vqmmc_enabled = false;

	ret = mmc_regulator_get_supply(mmc);

	if (ret)

		return ret;