* [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation
2011-07-06 3:34 [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
@ 2011-07-06 3:36 ` Axel Lin
2011-07-06 6:28 ` [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Jinyoung Park
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Axel Lin @ 2011-07-06 3:36 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown
The implementation in aat2870_update() already did the bitwise and operation
against mask parameter.
Signed-off-by: Axel Lin <axel.lin@gmail.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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-06 3:34 [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-07-06 3:36 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
@ 2011-07-06 6:28 ` Jinyoung Park
2011-07-06 6:44 ` Mark Brown
2011-07-06 19:31 ` Liam Girdwood
3 siblings, 0 replies; 5+ messages in thread
From: Jinyoung Park @ 2011-07-06 6:28 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel@vger.kernel.org, Liam Girdwood, Mark Brown
Hi, Axel
> 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.
You are right, the ri never be NULL in current implementation.
That's my mistake, I didn't find it when writing and verifying the driver.
Thanks,
Jin.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-06 3:34 [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-07-06 3:36 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
2011-07-06 6:28 ` [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Jinyoung Park
@ 2011-07-06 6:44 ` Mark Brown
2011-07-06 19:31 ` Liam Girdwood
3 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-07-06 6:44 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Jin Park, Liam Girdwood
On Wed, Jul 06, 2011 at 11:34:36AM +0800, Axel Lin wrote:
> 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.
Both
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-06 3:34 [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
` (2 preceding siblings ...)
2011-07-06 6:44 ` Mark Brown
@ 2011-07-06 19:31 ` Liam Girdwood
3 siblings, 0 replies; 5+ messages in thread
From: Liam Girdwood @ 2011-07-06 19:31 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel@vger.kernel.org, Jin Park, Mark Brown, Samuel Ortiz
On 06/07/11 04:34, Axel Lin wrote:
> 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>
> ---
> 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;
Can you resend both of these to Samuel with Mark's Ack as aat2870 went upstream via MFD.
Liam
^ permalink raw reply [flat|nested] 5+ messages in thread