Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c55d7a05 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Ulf Hansson
Browse files

mmc: host: omap_hsmmc: use regulator_is_enabled to find pbias status 



Use regulator_is_enabled of pbias regulator to find pbias regulator
status instead of maintaining a custom bookkeeping
pbias_enabled variable.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 3f77f702

drivers/mmc/host/omap_hsmmc.c

+2 −6
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ struct omap_hsmmc_host { 
	struct	clk		*fclk;

	struct	clk		*dbclk;

	struct	regulator	*pbias;

	bool			pbias_enabled;

	void	__iomem		*base;

	int			vqmmc_enabled;

	resource_size_t		mapbase;
@@ -330,22 +329,20 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on, 
			return ret;

		}



		if (host->pbias_enabled == 0) {

		if (!regulator_is_enabled(host->pbias)) {

			ret = regulator_enable(host->pbias);

			if (ret) {

				dev_err(host->dev, "pbias reg enable fail\n");

				return ret;

			}

			host->pbias_enabled = 1;

		}

	} else {

		if (host->pbias_enabled == 1) {

		if (regulator_is_enabled(host->pbias)) {

			ret = regulator_disable(host->pbias);

			if (ret) {

				dev_err(host->dev, "pbias reg disable fail\n");

				return ret;

			}

			host->pbias_enabled = 0;

		}

	}
@@ -2081,7 +2078,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 
	host->base	= base + pdata->reg_offset;

	host->power_mode = MMC_POWER_OFF;

	host->next_data.cookie = 1;

	host->pbias_enabled = 0;

	host->vqmmc_enabled = 0;



	ret = omap_hsmmc_gpio_init(mmc, host, pdata);