[patch] kill compile warning on twl4030-power.c

[patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

From: Felipe Balbi <felipe.balbi@nokia.com>

This part of the patch was left out on previous merge. Here's a
fix for that.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 04a13aa..afc19cd 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -215,7 +215,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
 static int __init config_sleep_wake_sequence(void)
 {
        int err = 0;
-       u8 data;
 
        /*
         * CLKREQ is pulled high on the 2430SDP, therefore, we need to take

-- 
balbi

Re: [patch] kill compile warning on twl4030-power.c

[Peter 'p2' De Schrijver]

On Mon, Sep 15, 2008 at 06:12:11PM +0300, ext Felipe Balbi wrote:
> From: Felipe Balbi <felipe.balbi@nokia.com>
> 
> This part of the patch was left out on previous merge. Here's a
> fix for that.
> 

I doubt this works if you compile for SDP or labrador. OTOH the code for
that bit looks suspicious :)

Cheers,

Peter.
-- 
goa is a state of mind

Re: [patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

On Mon, Sep 15, 2008 at 06:55:12PM +0300, Peter 'p2' De Schrijver wrote:
> On Mon, Sep 15, 2008 at 06:12:11PM +0300, ext Felipe Balbi wrote:
> > From: Felipe Balbi <felipe.balbi@nokia.com>
> > 
> > This part of the patch was left out on previous merge. Here's a
> > fix for that.
> > 
> 
> I doubt this works if you compile for SDP or labrador. OTOH the code for
> that bit looks suspicious :)

Hmmm... that's true. That variable is only used on 3430sdp and 3430
labrador. How about this version:

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 04a13aa..b8723e8 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -245,14 +245,15 @@ static int __init config_sleep_wake_sequence(void)
        err |= twl4030_write_script(0x2F, sleep_off_seq,
                                        ARRAY_SIZE(sleep_off_seq));
 
-#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
-       /* Disabling AC charger effect on sleep-active transitions */
-       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
-                                       R_CFG_P1_TRANSITION);
-       data &= 0x0;
-       err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
-                                       R_CFG_P1_TRANSITION);
-#endif
+       if (machine_is_omap_3430sdp()) {
+               /* Disabling AC charger effect on sleep-active transitions */
+               err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
+                               R_CFG_P1_TRANSITION);
+               data &= 0x0;
+               err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
+                               R_CFG_P1_TRANSITION);
+       }
+
        /* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
        err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
                                        R_P1_SW_EVENTS);

It's weird that a grep for LABRADOR on arch/arm does not return
anything. Are we missing some patches ??

-- 
balbi

Re: [patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

On Mon, Sep 15, 2008 at 07:21:25PM +0300, Felipe Balbi wrote:
> On Mon, Sep 15, 2008 at 06:55:12PM +0300, Peter 'p2' De Schrijver wrote:
> > On Mon, Sep 15, 2008 at 06:12:11PM +0300, ext Felipe Balbi wrote:
> > > From: Felipe Balbi <felipe.balbi@nokia.com>
> > > 
> > > This part of the patch was left out on previous merge. Here's a
> > > fix for that.
> > > 
> > 
> > I doubt this works if you compile for SDP or labrador. OTOH the code for
> > that bit looks suspicious :)
> 
> Hmmm... that's true. That variable is only used on 3430sdp and 3430
> labrador. How about this version:

and I missed the #include <asm/mach-types.h>

> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 04a13aa..b8723e8 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -245,14 +245,15 @@ static int __init config_sleep_wake_sequence(void)
>         err |= twl4030_write_script(0x2F, sleep_off_seq,
>                                         ARRAY_SIZE(sleep_off_seq));
>  
> -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> -       /* Disabling AC charger effect on sleep-active transitions */
> -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> -                                       R_CFG_P1_TRANSITION);
> -       data &= 0x0;
> -       err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> -                                       R_CFG_P1_TRANSITION);
> -#endif
> +       if (machine_is_omap_3430sdp()) {
> +               /* Disabling AC charger effect on sleep-active transitions */
> +               err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> +                               R_CFG_P1_TRANSITION);
> +               data &= 0x0;
> +               err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> +                               R_CFG_P1_TRANSITION);
> +       }
> +
>         /* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
>         err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
>                                         R_P1_SW_EVENTS);
-- 
balbi

Re: [patch] kill compile warning on twl4030-power.c

[Peter 'p2' De Schrijver]

Hi,

> > I doubt this works if you compile for SDP or labrador. OTOH the code for
> > that bit looks suspicious :)
> 
> Hmmm... that's true. That variable is only used on 3430sdp and 3430
> labrador. How about this version:
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 04a13aa..b8723e8 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -245,14 +245,15 @@ static int __init config_sleep_wake_sequence(void)
>         err |= twl4030_write_script(0x2F, sleep_off_seq,
>                                         ARRAY_SIZE(sleep_off_seq));
>  
> -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> -       /* Disabling AC charger effect on sleep-active transitions */
> -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> -                                       R_CFG_P1_TRANSITION);
> -       data &= 0x0;

This does not make sense :) 

> -       err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> -                                       R_CFG_P1_TRANSITION);
> -#endif
> +       if (machine_is_omap_3430sdp()) {
> +               /* Disabling AC charger effect on sleep-active transitions */
> +               err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> +                               R_CFG_P1_TRANSITION);
> +               data &= 0x0;
> +               err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> +                               R_CFG_P1_TRANSITION);
> +       }
> +
>         /* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
>         err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
>                                         R_P1_SW_EVENTS);
> 
> It's weird that a grep for LABRADOR on arch/arm does not return
> anything. Are we missing some patches ??
> 

Hmm. Good question :)

Cheers,

Peter.

-- 
goa is a state of mind

Re: [patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

On Mon, Sep 15, 2008 at 07:24:21PM +0300, Peter 'p2' De Schrijver wrote:
> Hi,
> 
> > > I doubt this works if you compile for SDP or labrador. OTOH the code for
> > > that bit looks suspicious :)
> > 
> > Hmmm... that's true. That variable is only used on 3430sdp and 3430
> > labrador. How about this version:
> > 
> > diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> > index 04a13aa..b8723e8 100644
> > --- a/drivers/i2c/chips/twl4030-power.c
> > +++ b/drivers/i2c/chips/twl4030-power.c
> > @@ -245,14 +245,15 @@ static int __init config_sleep_wake_sequence(void)
> >         err |= twl4030_write_script(0x2F, sleep_off_seq,
> >                                         ARRAY_SIZE(sleep_off_seq));
> >  
> > -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> > -       /* Disabling AC charger effect on sleep-active transitions */
> > -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> > -                                       R_CFG_P1_TRANSITION);
> > -       data &= 0x0;
> 
> This does not make sense :) 

Why not? That data variable is only used on 3430SDP and LABRADOR
anyways. Any other build will keep generating "unused variable" warnings
and that's annoying :-p

-- 
balbi

Re: [patch] kill compile warning on twl4030-power.c

[Peter 'p2' De Schrijver]

> > > -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> > > -       /* Disabling AC charger effect on sleep-active transitions */
> > > -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> > > -                                       R_CFG_P1_TRANSITION);
> > > -       data &= 0x0;
> > 
> > This does not make sense :) 
> 
> Why not? That data variable is only used on 3430SDP and LABRADOR
> anyways. Any other build will keep generating "unused variable" warnings
> and that's annoying :-p

Because a logical and with 0 will always result in 0. So the read is
useless. So the original code is probably wrong.

Cheers,

Peter.
-- 
goa is a state of mind

Re: [patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

On Mon, Sep 15, 2008 at 08:30:20PM +0300, Peter 'p2' De Schrijver wrote:
> > > > -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> > > > -       /* Disabling AC charger effect on sleep-active transitions */
> > > > -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> > > > -                                       R_CFG_P1_TRANSITION);
> > > > -       data &= 0x0;
> > > 
> > > This does not make sense :) 
> > 
> > Why not? That data variable is only used on 3430SDP and LABRADOR
> > anyways. Any other build will keep generating "unused variable" warnings
> > and that's annoying :-p
> 
> Because a logical and with 0 will always result in 0. So the read is
> useless. So the original code is probably wrong.

ehehe, but that's not what I was changing :-p

-- 
balbi

Re: [patch] kill compile warning on twl4030-power.c

[Felipe Balbi]

On Mon, Sep 15, 2008 at 08:30:20PM +0300, Peter 'p2' De Schrijver wrote:
> > > > -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> > > > -       /* Disabling AC charger effect on sleep-active transitions */
> > > > -       err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> > > > -                                       R_CFG_P1_TRANSITION);
> > > > -       data &= 0x0;
> > > 
> > > This does not make sense :) 
> > 
> > Why not? That data variable is only used on 3430SDP and LABRADOR
> > anyways. Any other build will keep generating "unused variable" warnings
> > and that's annoying :-p
> 
> Because a logical and with 0 will always result in 0. So the read is
> useless. So the original code is probably wrong.

Maybe you meant data &= ~(1 << 0);  ???

-- 
balbi

[PATCH] Fix build for beagleboard

[Peter 'p2' De Schrijver]

Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
---
 drivers/i2c/chips/twl4030-power.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
index 195c3c4..ea8f447 100644
--- a/drivers/i2c/chips/twl4030-power.c
+++ b/drivers/i2c/chips/twl4030-power.c
@@ -212,7 +216,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
 static int __init config_sleep_wake_sequence(void)
 {
 	int err = 0;
-	u8 data;
 
 	/*
 	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
@@ -242,14 +245,16 @@ static int __init config_sleep_wake_sequence(void)
 	err |= twl4030_write_script(0x2F, sleep_off_seq,
 					ARRAY_SIZE(sleep_off_seq));
 
-#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
-	/* Disabling AC charger effect on sleep-active transitions */
-	err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
-					R_CFG_P1_TRANSITION);
-	data &= 0x0;
-	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
-					R_CFG_P1_TRANSITION);
-#endif
+	if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
+		u8 data;
+		/* Disabling AC charger effect on sleep-active transitions */
+		err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
+						R_CFG_P1_TRANSITION);
+		data &= ~(1<<1);
+		err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
+						R_CFG_P1_TRANSITION);
+	}
+
 	/* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
 	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
 					R_P1_SW_EVENTS);
-- 
1.5.6.3

Re: [PATCH] Fix build for beagleboard

[Tony Lindgren]

* Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com> [080916 15:30]:

Pushing.

Tony

> 
> Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@nokia.com>
> ---
>  drivers/i2c/chips/twl4030-power.c |   25 +++++++++++++++----------
>  1 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/i2c/chips/twl4030-power.c b/drivers/i2c/chips/twl4030-power.c
> index 195c3c4..ea8f447 100644
> --- a/drivers/i2c/chips/twl4030-power.c
> +++ b/drivers/i2c/chips/twl4030-power.c
> @@ -212,7 +216,6 @@ static int __init twl4030_write_script(u8 address, struct triton_ins *script,
>  static int __init config_sleep_wake_sequence(void)
>  {
>  	int err = 0;
> -	u8 data;
>  
>  	/*
>  	 * CLKREQ is pulled high on the 2430SDP, therefore, we need to take
> @@ -242,14 +245,16 @@ static int __init config_sleep_wake_sequence(void)
>  	err |= twl4030_write_script(0x2F, sleep_off_seq,
>  					ARRAY_SIZE(sleep_off_seq));
>  
> -#if defined(CONFIG_MACH_OMAP_3430SDP) || defined(CONFIG_MACH_OMAP_3430LABRADOR)
> -	/* Disabling AC charger effect on sleep-active transitions */
> -	err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> -					R_CFG_P1_TRANSITION);
> -	data &= 0x0;
> -	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> -					R_CFG_P1_TRANSITION);
> -#endif
> +	if (machine_is_omap_3430sdp() || machine_is_omap_ldp()) {
> +		u8 data;
> +		/* Disabling AC charger effect on sleep-active transitions */
> +		err |= twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &data,
> +						R_CFG_P1_TRANSITION);
> +		data &= ~(1<<1);
> +		err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, data ,
> +						R_CFG_P1_TRANSITION);
> +	}
> +
>  	/* P1/P2/P3 LVL_WAKEUP should be on LEVEL */
>  	err |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, LVL_WAKEUP,
>  					R_P1_SW_EVENTS);
> -- 
> 1.5.6.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html