]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
authorTony Lindgren <tony@atomide.com>
Tue, 5 Feb 2013 18:36:21 +0000 (10:36 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Feb 2013 18:36:21 +0000 (10:36 -0800)
With the recent twl related changes we can now get:

WARNING: arch/arm/mach-omap2/built-in.o(.text+0x15f88): Section mismatch in
reference from the function sdp3430_twl_gpio_setup() to the function
.init.text:omap_twl4030_audio_init()
The function sdp3430_twl_gpio_setup() references
the function __init omap_twl4030_audio_init().
This is often because sdp3430_twl_gpio_setup lacks a __init
annotation or the annotation of omap_twl4030_audio_init is wrong.

WARNING: arch/arm/mach-omap2/built-in.o(.text+0x16968): Section mismatch in
reference from the function zoom_twl_gpio_setup() to the function
.init.text:omap_twl4030_audio_init()
The function zoom_twl_gpio_setup() references
the function __init omap_twl4030_audio_init().
This is often because zoom_twl_gpio_setup lacks a __init
annotation or the annotation of omap_twl4030_audio_init is wrong.

Fix this by removing __init from omap_twl4030_audio_init() as
suggested by Peter Ujfalusi <peter.ujfalusi@ti.com>.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/twl-common.c

index 931495a2587244a2c3060631af42b08279bebead..62cf40b86e4a13666804bcd976d539d5c71e96da 100644 (file)
@@ -536,7 +536,7 @@ static struct platform_device audio_device = {
        .id             = -1,
 };
 
-void __init omap_twl4030_audio_init(char *card_name,
+void omap_twl4030_audio_init(char *card_name,
                                    struct omap_tw4030_pdata *pdata)
 {
        if (!pdata)
@@ -549,7 +549,7 @@ void __init omap_twl4030_audio_init(char *card_name,
 }
 
 #else /* SOC_OMAP_TWL4030 */
-void __init omap_twl4030_audio_init(char *card_name,
+void omap_twl4030_audio_init(char *card_name,
                                    struct omap_tw4030_pdata *pdata)
 {
        return;