2011-05-10 11:10:49

by Axel Lin

Subject: [PATCH] Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array"

I check this patch again and found this actually is not a bug
because MC13xxx_DEFINE explictly defines the order of each entry in the array.

Thus revert the patch.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/mc13892-regulator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index ba909cb..1b8f739 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -259,6 +259,7 @@ static struct regulator_ops mc13892_sw_regulator_ops;
mc13xxx_regulator_ops)

static struct mc13xxx_regulator mc13892_regulators[] = {
+ MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell),
MC13892_SW_DEFINE(SW1, SWITCHERS0, SWITCHERS0, mc13892_sw1),
MC13892_SW_DEFINE(SW2, SWITCHERS1, SWITCHERS1, mc13892_sw),
MC13892_SW_DEFINE(SW3, SWITCHERS2, SWITCHERS2, mc13892_sw),
@@ -292,7 +293,6 @@ static struct mc13xxx_regulator mc13892_regulators[] = {
MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo),
MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv),
MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv),
- MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell),
};

static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
--
1.7.1

2011-05-10 11:27:32

by Mark Brown

Subject: Re: [PATCH] Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array"

On Tue, May 10, 2011 at 07:10:36PM +0800, Axel Lin wrote:
> I check this patch again and found this actually is not a bug
> because MC13xxx_DEFINE explictly defines the order of each entry in the array.
>
> Thus revert the patch.
>
> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Mark Brown <[email protected]>

but this seems like something error prone that we probably want to
consider fixing anyway?

2011-05-10 19:57:07

by Liam Girdwood

Subject: Re: [PATCH] Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array"

On Tue, 2011-05-10 at 19:10 +0800, Axel Lin wrote:
> I check this patch again and found this actually is not a bug
> because MC13xxx_DEFINE explictly defines the order of each entry in the array.
>
> Thus revert the patch.
>
> Signed-off-by: Axel Lin <[email protected]>

Applied.