[2.6.29-rc8-omap] twl4030 power scripts, initsection fixups

Commit Message

Felipe Balbi March 14, 2009, 10:57 a.m. UTC

On Fri, Mar 13, 2009 at 06:25:52PM -0700, David Brownell wrote:
> From: David Brownell <[e-mail]>
> 
> Remove section mismatch warnings from twl4030 power script
> declaration ... unfortunately, this use-once data can't live
> in initdata sections (or initconst) until some driver stacks
> (starting with I2C) have better support for non-hotpluggable
> componentry.

should you update this with the following ?

Comments

David Brownell March 14, 2009, 7 p.m. UTC | #1

On Saturday 14 March 2009, Felipe Balbi wrote:
> > 
> > Remove section mismatch warnings from twl4030 power script
> > declaration ... unfortunately, this use-once data can't live
> > in initdata sections (or initconst) until some driver stacks
> > (starting with I2C) have better support for non-hotpluggable
> > componentry.
> 
> should you update this with the following ?

I didn't see any section mismatch warnings from this goofage.  ;)

But, yes this looks wrong too.  Resend with your s-o-b ...


> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -66,7 +66,7 @@ static u8 triton_next_free_address = 0x2b;
>  #define KEY_1                  0xC0
>  #define KEY_2                  0x0C
>  
> -static int __init twl4030_write_script_byte(u8 address, u8 byte)
> +static int twl4030_write_script_byte(u8 address, u8 byte)
>  {
>         int err;
> 
> 	... deleted similar changes ...


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index d9d1655..1f246e8 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -66,7 +66,7 @@  static u8 triton_next_free_address = 0x2b;
 #define KEY_1			0xC0
 #define KEY_2			0x0C
 
-static int __init twl4030_write_script_byte(u8 address, u8 byte)
+static int twl4030_write_script_byte(u8 address, u8 byte)
 {
 	int err;
 
@@ -78,7 +78,7 @@  static int __init twl4030_write_script_byte(u8 address, u8 byte)
 	return err;
 }
 
-static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,
+static int twl4030_write_script_ins(u8 address, u16 pmb_message,
 						u8 delay, u8 next)
 {
 	int err = 0;
@@ -92,7 +92,7 @@  static int __init twl4030_write_script_ins(u8 address, u16 pmb_message,
 	return err;
 }
 
-static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
+static int twl4030_write_script(u8 address, struct twl4030_ins *script,
 					int len)
 {
 	int err = 0;
@@ -113,7 +113,7 @@  static int __init twl4030_write_script(u8 address, struct twl4030_ins *script,
 	return err;
 }
 
-static int __init config_wakeup3_sequence(u8 address)
+static int config_wakeup3_sequence(u8 address)
 {
 
 	int err = 0;
@@ -131,7 +131,7 @@  static int __init config_wakeup3_sequence(u8 address)
 	return err;
 }
 
-static int __init config_wakeup12_sequence(u8 address)
+static int config_wakeup12_sequence(u8 address)
 {
 	int err = 0;
 
@@ -162,7 +162,7 @@  static int __init config_wakeup12_sequence(u8 address)
 	return err;
 }
 
-static int __init config_sleep_sequence(u8 address)
+static int config_sleep_sequence(u8 address)
 {
 	int err = 0;
 
@@ -184,7 +184,7 @@  static int __init config_sleep_sequence(u8 address)
 	return err;
 }
 
-static int __init config_warmreset_sequence(u8 address)
+static int config_warmreset_sequence(u8 address)
 {
 
 	int err = 0;
@@ -219,7 +219,7 @@  static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-static int __init load_triton_script(struct twl4030_script *tscript)
+static int load_triton_script(struct twl4030_script *tscript)
 {
 	u8 address = triton_next_free_address;
 	int err;
@@ -245,7 +245,7 @@  static int __init load_triton_script(struct twl4030_script *tscript)
 	return err;
 }
 
-void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
+void twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 {
 	int err = 0;
 	int i;