leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Kishon Vijay Abraham I 2015-08-27 14:44:05 +05:30 committed by Ulf Hansson
parent 3f77f70238
commit c55d7a0553
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mmc/host/omap_hsmmc.c
View File

@ -182,7 +182,6 @@ struct omap_hsmmc_host {
struct clk *fclk; struct clk *fclk;
struct clk *dbclk; struct clk *dbclk;
struct regulator *pbias; struct regulator *pbias;
bool pbias_enabled;
void __iomem *base; void __iomem *base;
int vqmmc_enabled; int vqmmc_enabled;
resource_size_t mapbase; resource_size_t mapbase;
@ -330,22 +329,20 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on,
return ret; return ret;
} }
if (host->pbias_enabled == 0) { if (!regulator_is_enabled(host->pbias)) {
ret = regulator_enable(host->pbias); ret = regulator_enable(host->pbias);
if (ret) { if (ret) {
dev_err(host->dev, "pbias reg enable fail\n"); dev_err(host->dev, "pbias reg enable fail\n");
return ret; return ret;
} }
host->pbias_enabled = 1;
} }
} else { } else {
if (host->pbias_enabled == 1) { if (regulator_is_enabled(host->pbias)) {
ret = regulator_disable(host->pbias); ret = regulator_disable(host->pbias);
if (ret) { if (ret) {
dev_err(host->dev, "pbias reg disable fail\n"); dev_err(host->dev, "pbias reg disable fail\n");
return ret; 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->base = base + pdata->reg_offset;
host->power_mode = MMC_POWER_OFF; host->power_mode = MMC_POWER_OFF;
host->next_data.cookie = 1; host->next_data.cookie = 1;
host->pbias_enabled = 0;
host->vqmmc_enabled = 0; host->vqmmc_enabled = 0;
ret = omap_hsmmc_gpio_init(mmc, host, pdata); ret = omap_hsmmc_gpio_init(mmc, host, pdata);