@@ -1265,7 +1265,7 @@ EXPORT_SYMBOL_GPL(mmc_regulator_get_ocrmask);
* a particular supply voltage. This would normally be called from the
* set_ios() method.
*/
-int mmc_regulator_set_ocr(struct mmc_host *mmc,
+int mmc_regulator_set_ocr(struct mmc_host *host,
struct regulator *supply,
unsigned short vdd_bit)
{
@@ -1307,42 +1307,42 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
else
result = 0;
- if (result == 0 && !mmc->regulator_enabled) {
+ if (result == 0 && !host->regulator_enabled) {
result = regulator_enable(supply);
if (!result)
- mmc->regulator_enabled = true;
+ host->regulator_enabled = true;
}
- } else if (mmc->regulator_enabled) {
+ } else if (host->regulator_enabled) {
result = regulator_disable(supply);
if (result == 0)
- mmc->regulator_enabled = false;
+ host->regulator_enabled = false;
}
if (result)
- dev_err(mmc_dev(mmc),
+ dev_err(mmc_dev(host),
"could not set regulator OCR (%d)\n", result);
return result;
}
EXPORT_SYMBOL_GPL(mmc_regulator_set_ocr);
-int mmc_regulator_get_supply(struct mmc_host *mmc)
+int mmc_regulator_get_supply(struct mmc_host *host)
{
- struct device *dev = mmc_dev(mmc);
+ struct device *dev = mmc_dev(host);
struct regulator *supply;
int ret;
supply = devm_regulator_get(dev, "vmmc");
- mmc->supply.vmmc = supply;
- mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");
+ host->supply.vmmc = supply;
+ host->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");
if (IS_ERR(supply))
return PTR_ERR(supply);
ret = mmc_regulator_get_ocrmask(supply);
if (ret > 0)
- mmc->ocr_avail = ret;
+ host->ocr_avail = ret;
else
- dev_warn(mmc_dev(mmc), "Failed getting OCR mask: %d\n", ret);
+ dev_warn(mmc_dev(host), "Failed getting OCR mask: %d\n", ret);
return 0;
}
mmc_host is used the "host" in core.c. To be consistent, change the variable name from "mmc" to "host". (Minor fixing) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- drivers/mmc/core/core.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)