mmc: core: Allow invalid regulator in mmc_regulator_set_ocr()

Basically all host drivers use code like this:

if (!IS_ERR(mmc->supply.vmmc))
	mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0)

Move the IS_ERR() check to mmc_regulator_set_ocr() to simplify host driver
code.

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/0c1e7440-f4bc-b48a-137f-58b75ac98550@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c
index 609201a467ef954e64c9ebc71c57a0f3a7b976d1..4fad81cd5252bbb21bc95d5430774f8ba4d6ab25 100644 (file)
--- a/drivers/mmc/core/regulator.c
+++ b/drivers/mmc/core/regulator.c
@@ -110,6 +110,9 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,
        int                     result = 0;
        int                     min_uV, max_uV;
 
+       if (IS_ERR(supply))
+               return 0;
+
        if (vdd_bit) {
                mmc_ocrbitnum_to_vdd(vdd_bit, &min_uV, &max_uV);