[PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Axel Lin]

In current implementation, the pointer ri is not NULL if no id is matched.
Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/regulator/aat2870-regulator.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index cd41045..11d1ab4 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
 			break;
 	}
 
-	if (!ri)
+	if (i == ARRAY_SIZE(aat2870_regulators))
 		return NULL;
 
 	ri->enable_addr = AAT2870_LDO_EN;
-- 
1.7.4.1

[PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation

[Axel Lin]

The implementation in aat2870_update() already did the bitwise and operation
against mask parameter.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/regulator/aat2870-regulator.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 11d1ab4..c8ea28e 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -62,7 +62,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
 	struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
 
 	return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
-			(selector << ri->voltage_shift) & ri->voltage_mask);
+			selector << ri->voltage_shift);
 }
 
 static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
-- 
1.7.4.1

Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Axel Lin]

hi,
Seems this 2 patches are not upstream. Should I resend it again?
Regards,
Axel

2011/7/7 Axel Lin <axel.lin@gmail.com>:
> In current implementation, the pointer ri is not NULL if no id is matched.
> Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  drivers/regulator/aat2870-regulator.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
> index cd41045..11d1ab4 100644
> --- a/drivers/regulator/aat2870-regulator.c
> +++ b/drivers/regulator/aat2870-regulator.c
> @@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
>                        break;
>        }
>
> -       if (!ri)
> +       if (i == ARRAY_SIZE(aat2870_regulators))
>                return NULL;
>
>        ri->enable_addr = AAT2870_LDO_EN;
> --
> 1.7.4.1
>
>
>
>

Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Liam Girdwood]

On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
> hi,
> Seems this 2 patches are not upstream. Should I resend it again?
> Regards,
> Axel

Not required atm thanks, this driver went via mfd so I can apply the fix
after the mfd merge or rc1.

Liam

> 
> 2011/7/7 Axel Lin <axel.lin@gmail.com>:
> > In current implementation, the pointer ri is not NULL if no id is matched.
> > Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
> >
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > ---
> >  drivers/regulator/aat2870-regulator.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
> > index cd41045..11d1ab4 100644
> > --- a/drivers/regulator/aat2870-regulator.c
> > +++ b/drivers/regulator/aat2870-regulator.c
> > @@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
> >                        break;
> >        }
> >
> > -       if (!ri)
> > +       if (i == ARRAY_SIZE(aat2870_regulators))
> >                return NULL;
> >
> >        ri->enable_addr = AAT2870_LDO_EN;
> > --
> > 1.7.4.1
> >
> >
> >
> >

Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Axel Lin]

2011/7/30 Liam Girdwood <lrg@ti.com>:
> On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
>> hi,
>> Seems this 2 patches are not upstream. Should I resend it again?
>> Regards,
>> Axel
>
> Not required atm thanks, this driver went via mfd so I can apply the fix
> after the mfd merge or rc1.
hi Liam,
aat2870-regulator.c is already merged to your tree but
seems these 2 patches are not (yet) upstream.

Regards,
Axel

Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Liam Girdwood]

On 10/08/11 16:19, Axel Lin wrote:
> 2011/7/30 Liam Girdwood <lrg@ti.com>:
>> On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
>>> hi,
>>> Seems this 2 patches are not upstream. Should I resend it again?
>>> Regards,
>>> Axel
>>
>> Not required atm thanks, this driver went via mfd so I can apply the fix
>> after the mfd merge or rc1.
> hi Liam,
> aat2870-regulator.c is already merged to your tree but
> seems these 2 patches are not (yet) upstream.
> 

Could you check regulator git #for-linus. I applied a bunch of patches a few days ago and some for this device. I'll do a pull request for rc2 in a few days.

Thanks

Liam 

Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator

[Axel Lin]

> Could you check regulator git #for-linus. I applied a bunch of patches a few days ago and some for this device. I'll do a pull request for rc2 in a few days.

Just checked both #for-linus and #for-next, I'm sure these 2 patches
are missing.

below is the commit history for aat2870-regulator.c:
#for-linus
http://git.kernel.org/?p=linux/kernel/git/lrg/voltage-2.6.git;a=history;f=drivers/regulator/aat2870-regulator.c;h=5abeb3ac3e8da43df3d58bf677c3ac0e3d17116e;hb=9d92d3fc20b2095b75d66824e5cc34a9e088dea0

#for-next
http://git.kernel.org/?p=linux/kernel/git/lrg/voltage-2.6.git;a=history;f=drivers/regulator/aat2870-regulator.c;h=5abeb3ac3e8da43df3d58bf677c3ac0e3d17116e;hb=fc999b83799074832367d3cfd724c341c849a7da

Regards,
Axel

[PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation

[Axel Lin]

The implementation in aat2870_update() already did the bitwise and operation
against mask parameter.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/regulator/aat2870-regulator.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 11d1ab4..c8ea28e 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -62,7 +62,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
 	struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
 
 	return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
-			(selector << ri->voltage_shift) & ri->voltage_mask);
+			selector << ri->voltage_shift);
 }
 
 static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
-- 
1.7.4.1