diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-07 05:00:34 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-13 05:00:35 -0500 |
commit | a0bb10e86642064f6cec9e23f523127e5cfbe609 (patch) | |
tree | 9268898b0563af220eb7481b9e7a55314763fecd /drivers | |
parent | 0bf68f53f164e169c2bc77f707338fc595b6ccfc (diff) |
ARM: omap: fix section mismatch errors in TWL PMIC driver
WARNING: drivers/mfd/built-in.o(.devinit.text+0x258): Section mismatch in reference from the function twl_probe() to the function .init.text:twl4030_power_init()
The function __devinit twl_probe() references
a function __init twl4030_power_init().
If twl4030_power_init is only used by twl_probe then
annotate twl4030_power_init with a matching annotation.
twl4030_power_init() references other __init marked functions, so
these too must become __devinit.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/twl4030-power.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index d905f5171153..79ca33dfacca 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c | |||
@@ -124,7 +124,7 @@ static u8 res_config_addrs[] = { | |||
124 | [RES_MAIN_REF] = 0x94, | 124 | [RES_MAIN_REF] = 0x94, |
125 | }; | 125 | }; |
126 | 126 | ||
127 | static int __init twl4030_write_script_byte(u8 address, u8 byte) | 127 | static int __devinit twl4030_write_script_byte(u8 address, u8 byte) |
128 | { | 128 | { |
129 | int err; | 129 | int err; |
130 | 130 | ||
@@ -138,7 +138,7 @@ out: | |||
138 | return err; | 138 | return err; |
139 | } | 139 | } |
140 | 140 | ||
141 | static int __init twl4030_write_script_ins(u8 address, u16 pmb_message, | 141 | static int __devinit twl4030_write_script_ins(u8 address, u16 pmb_message, |
142 | u8 delay, u8 next) | 142 | u8 delay, u8 next) |
143 | { | 143 | { |
144 | int err; | 144 | int err; |
@@ -158,7 +158,7 @@ out: | |||
158 | return err; | 158 | return err; |
159 | } | 159 | } |
160 | 160 | ||
161 | static int __init twl4030_write_script(u8 address, struct twl4030_ins *script, | 161 | static int __devinit twl4030_write_script(u8 address, struct twl4030_ins *script, |
162 | int len) | 162 | int len) |
163 | { | 163 | { |
164 | int err; | 164 | int err; |
@@ -183,7 +183,7 @@ static int __init twl4030_write_script(u8 address, struct twl4030_ins *script, | |||
183 | return err; | 183 | return err; |
184 | } | 184 | } |
185 | 185 | ||
186 | static int __init twl4030_config_wakeup3_sequence(u8 address) | 186 | static int __devinit twl4030_config_wakeup3_sequence(u8 address) |
187 | { | 187 | { |
188 | int err; | 188 | int err; |
189 | u8 data; | 189 | u8 data; |
@@ -208,7 +208,7 @@ out: | |||
208 | return err; | 208 | return err; |
209 | } | 209 | } |
210 | 210 | ||
211 | static int __init twl4030_config_wakeup12_sequence(u8 address) | 211 | static int __devinit twl4030_config_wakeup12_sequence(u8 address) |
212 | { | 212 | { |
213 | int err = 0; | 213 | int err = 0; |
214 | u8 data; | 214 | u8 data; |
@@ -262,7 +262,7 @@ out: | |||
262 | return err; | 262 | return err; |
263 | } | 263 | } |
264 | 264 | ||
265 | static int __init twl4030_config_sleep_sequence(u8 address) | 265 | static int __devinit twl4030_config_sleep_sequence(u8 address) |
266 | { | 266 | { |
267 | int err; | 267 | int err; |
268 | 268 | ||
@@ -276,7 +276,7 @@ static int __init twl4030_config_sleep_sequence(u8 address) | |||
276 | return err; | 276 | return err; |
277 | } | 277 | } |
278 | 278 | ||
279 | static int __init twl4030_config_warmreset_sequence(u8 address) | 279 | static int __devinit twl4030_config_warmreset_sequence(u8 address) |
280 | { | 280 | { |
281 | int err; | 281 | int err; |
282 | u8 rd_data; | 282 | u8 rd_data; |
@@ -324,7 +324,7 @@ out: | |||
324 | return err; | 324 | return err; |
325 | } | 325 | } |
326 | 326 | ||
327 | static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) | 327 | static int __devinit twl4030_configure_resource(struct twl4030_resconfig *rconfig) |
328 | { | 328 | { |
329 | int rconfig_addr; | 329 | int rconfig_addr; |
330 | int err; | 330 | int err; |
@@ -416,7 +416,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) | |||
416 | return 0; | 416 | return 0; |
417 | } | 417 | } |
418 | 418 | ||
419 | static int __init load_twl4030_script(struct twl4030_script *tscript, | 419 | static int __devinit load_twl4030_script(struct twl4030_script *tscript, |
420 | u8 address) | 420 | u8 address) |
421 | { | 421 | { |
422 | int err; | 422 | int err; |
@@ -527,7 +527,7 @@ void twl4030_power_off(void) | |||
527 | pr_err("TWL4030 Unable to power off\n"); | 527 | pr_err("TWL4030 Unable to power off\n"); |
528 | } | 528 | } |
529 | 529 | ||
530 | void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts) | 530 | void __devinit twl4030_power_init(struct twl4030_power_data *twl4030_scripts) |
531 | { | 531 | { |
532 | int err = 0; | 532 | int err = 0; |
533 | int i; | 533 | int i; |