diff mbox series

mmc: core: allow errptr supply argument in, mmc_regulator_set_ocr

Message ID 0c1e7440-f4bc-b48a-137f-58b75ac98550@gmail.com (mailing list archive)
State New, archived
Headers show
Series mmc: core: allow errptr supply argument in, mmc_regulator_set_ocr | expand

Commit Message

Heiner Kallweit Feb. 27, 2023, 9:02 p.m. UTC
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>
---
 drivers/mmc/core/regulator.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Ulf Hansson March 9, 2023, 3:02 p.m. UTC | #1
On Mon, 27 Feb 2023 at 22:02, Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> 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>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/core/regulator.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c
> index 609201a46..4fad81cd5 100644
> --- 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);
>
> --
> 2.39.2
>
diff mbox series

Patch

diff --git a/drivers/mmc/core/regulator.c b/drivers/mmc/core/regulator.c
index 609201a46..4fad81cd5 100644
--- 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);