[PATCH] mmc: always save error codes in mmc_regulator_get_supply()

[PATCH] mmc: always save error codes in mmc_regulator_get_supply()

[Guennadi Liakhovetski]

If mmc_regulator_get_supply() fails to obtain any of the regulators, store
the error codes in struct mmc_host to unify error reporting to the host
driver.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

Chris, if you don't mind rebasing your mmc-next branch, feel free to roll 
this patch into the original "mmc: add a function to get regulators, 
supplying card's power". Otherwise, committing it as an incremental patch 
is also ok.

 drivers/mmc/core/core.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 385cadf..d0f17d8 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1020,13 +1020,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
 	int ret;
 
 	supply = devm_regulator_get(dev, "vmmc");
+	mmc->supply.vmmc = supply;
+	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
 
 	if (IS_ERR(supply))
 		return PTR_ERR(supply);
 
-	mmc->supply.vmmc = supply;
-	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
-
 	ret = mmc_regulator_get_ocrmask(supply);
 	if (ret > 0)
 		mmc->ocr_avail = ret;
-- 
1.7.2.5

Re: [PATCH] mmc: always save error codes in mmc_regulator_get_supply()

[Pankaj Jangra]

Hi,

On Wed, Jun 27, 2012 at 8:48 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> wrote:
> If mmc_regulator_get_supply() fails to obtain any of the regulators, store
> the error codes in struct mmc_host to unify error reporting to the host
> driver.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> Chris, if you don't mind rebasing your mmc-next branch, feel free to roll
> this patch into the original "mmc: add a function to get regulators,
> supplying card's power". Otherwise, committing it as an incremental patch
> is also ok.
>
>  drivers/mmc/core/core.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 385cadf..d0f17d8 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1020,13 +1020,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
>         int ret;
>
>         supply = devm_regulator_get(dev, "vmmc");
> +       mmc->supply.vmmc = supply;
> +       mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
>
>         if (IS_ERR(supply))
>                 return PTR_ERR(supply);
>
> -       mmc->supply.vmmc = supply;
> -       mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
> -

I have a doubt here. Though  i am not much know to mmc code, but could
you please explain what is the benefit of moving these
statements above the error checking. I mean if you are not able to get
"vmmc" supply then why do you care to get the supply "vqmmc"
while by this error check you want to bail out from here ASAP and also
by doing this you are unnecessarily increasing the consumer
for "vqmmc" supply.  Please let me know if i am missing something here.

Also if you want to save the error code only you may want to move the
statement "mmc->supply.vmmc = supply"  only above the error
checking right?

>         ret = mmc_regulator_get_ocrmask(supply);
>         if (ret > 0)
>                 mmc->ocr_avail = ret;
> --

Regards,
Pankaj Jangra

Re: [PATCH] mmc: always save error codes in mmc_regulator_get_supply()

[Guennadi Liakhovetski]

Hi

On Mon, 2 Jul 2012, Pankaj Jangra wrote:

> Hi,
> 
> On Wed, Jun 27, 2012 at 8:48 PM, Guennadi Liakhovetski
> <g.liakhovetski@gmx.de> wrote:
> > If mmc_regulator_get_supply() fails to obtain any of the regulators, store
> > the error codes in struct mmc_host to unify error reporting to the host
> > driver.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > Chris, if you don't mind rebasing your mmc-next branch, feel free to roll
> > this patch into the original "mmc: add a function to get regulators,
> > supplying card's power". Otherwise, committing it as an incremental patch
> > is also ok.
> >
> >  drivers/mmc/core/core.c |    5 ++---
> >  1 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> > index 385cadf..d0f17d8 100644
> > --- a/drivers/mmc/core/core.c
> > +++ b/drivers/mmc/core/core.c
> > @@ -1020,13 +1020,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
> >         int ret;
> >
> >         supply = devm_regulator_get(dev, "vmmc");
> > +       mmc->supply.vmmc = supply;
> > +       mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
> >
> >         if (IS_ERR(supply))
> >                 return PTR_ERR(supply);
> >
> > -       mmc->supply.vmmc = supply;
> > -       mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
> > -
> 
> I have a doubt here. Though  i am not much know to mmc code, but could
> you please explain what is the benefit of moving these
> statements above the error checking. I mean if you are not able to get
> "vmmc" supply then why do you care to get the supply "vqmmc"

I'm not sure about this. I moving those assignments I achieve two goals:

1. consistency: upon return from that function both supply struct members 
contain either a pointer to the respective regulator, or an error code, 
and both regulators have been tried.
2. maximum flexibility: we try both regulators in any case and let 
individual drivers decide what is acceptable to them. It does seem more 
natural to rely more on the "vmmc" supply than on "vqmmc," but if a driver 
decides to go only with the latter one - why should we prohibit that?

Thanks
Guennadi

> while by this error check you want to bail out from here ASAP and also
> by doing this you are unnecessarily increasing the consumer
> for "vqmmc" supply.  Please let me know if i am missing something here.
> 
> Also if you want to save the error code only you may want to move the
> statement "mmc->supply.vmmc = supply"  only above the error
> checking right?
> 
> >         ret = mmc_regulator_get_ocrmask(supply);
> >         if (ret > 0)
> >                 mmc->ocr_avail = ret;
> > --
> 
> Regards,
> Pankaj Jangra
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH] mmc: always save error codes in mmc_regulator_get_supply()

[Chris Ball]

Hi,

On Wed, Jun 27 2012, Guennadi Liakhovetski wrote:
> If mmc_regulator_get_supply() fails to obtain any of the regulators, store
> the error codes in struct mmc_host to unify error reporting to the host
> driver.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> Chris, if you don't mind rebasing your mmc-next branch, feel free to roll 
> this patch into the original "mmc: add a function to get regulators, 
> supplying card's power". Otherwise, committing it as an incremental patch 
> is also ok.
>
>  drivers/mmc/core/core.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 385cadf..d0f17d8 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1020,13 +1020,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
>  	int ret;
>  
>  	supply = devm_regulator_get(dev, "vmmc");
> +	mmc->supply.vmmc = supply;
> +	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
>  
>  	if (IS_ERR(supply))
>  		return PTR_ERR(supply);
>  
> -	mmc->supply.vmmc = supply;
> -	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
> -
>  	ret = mmc_regulator_get_ocrmask(supply);
>  	if (ret > 0)
>  		mmc->ocr_avail = ret;

Thanks, I rebased it and pushed out to mmc-next.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child