Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: host: omap_hsmmc: cleanup omap_hsmmc_reg_get()

Browse source 
No functional change. Instead of using a local regulator variable
in omap_hsmmc_reg_get() for holding the return value of
devm_regulator_get_optional() and then assigning to omap_hsmmc_host
regulator members: vcc, vcc_aux and pbias, directly use the
omap_hsmmc_host regulator members.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Roger Quadros <rogerq@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:43:55 +05:30 committed by Ulf Hansson
parent 6a9b2ff07d
commit c299dc3988
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/mmc/host/omap_hsmmc.c
View file

@ -343,24 +343,22 @@ static int omap_hsmmc_set_power(struct device *dev, int power_on, int vdd)
static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
{
struct regulator *reg;
int ocr_value = 0;
int ret;
if (mmc_pdata(host)->set_power)
return 0;
reg = devm_regulator_get_optional(host->dev, "vmmc");
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
host->vcc = devm_regulator_get_optional(host->dev, "vmmc");
if (IS_ERR(host->vcc)) {
ret = PTR_ERR(host->vcc);
if (ret != -ENODEV)
return ret;
host->vcc = NULL;
dev_dbg(host->dev, "unable to get vmmc regulator %ld\n",
PTR_ERR(reg));
PTR_ERR(host->vcc));
host->vcc = NULL;
} else {
host->vcc = reg;
ocr_value = mmc_regulator_get_ocrmask(reg);
ocr_value = mmc_regulator_get_ocrmask(host->vcc);
if (!mmc_pdata(host)->ocr_mask) {
mmc_pdata(host)->ocr_mask = ocr_value;
} else {
@ -374,28 +372,24 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
}
/* Allow an aux regulator */
reg = devm_regulator_get_optional(host->dev, "vmmc_aux");
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
host->vcc_aux = devm_regulator_get_optional(host->dev, "vmmc_aux");
if (IS_ERR(host->vcc_aux)) {
ret = PTR_ERR(host->vcc_aux);
if (ret != -ENODEV)
return ret;
host->vcc_aux = NULL;
dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n",
PTR_ERR(reg));
} else {
host->vcc_aux = reg;
PTR_ERR(host->vcc_aux));
host->vcc_aux = NULL;
}
reg = devm_regulator_get_optional(host->dev, "pbias");
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
host->pbias = devm_regulator_get_optional(host->dev, "pbias");
if (IS_ERR(host->pbias)) {
ret = PTR_ERR(host->pbias);
if (ret != -ENODEV)
return ret;
host->pbias = NULL;
dev_dbg(host->dev, "unable to get pbias regulator %ld\n",
PTR_ERR(reg));
} else {
host->pbias = reg;
PTR_ERR(host->pbias));
host->pbias = NULL;
}
/* For eMMC do not power off when not in sleep state */