Skip to contentSkip to conversation

mfd/vexpress: vexpress_sysreg_setup must not be __init

PATCH New Arnd Bergmann 2 participants 2 messages Jan 25, 2013 – Jan 28, 2013

Subsystems (2)
Multifunction devices (MFD) Arm/versatile express platform
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 mfd/vexpress: vexpress_sysreg_setup must not be __init

The patch 52666298a 'mfd: vexpress-sysreg: Don't skip initialization on probe' adds a call to vexpress_sysreg_setup from a non-__init function, so this also has to lose its __init annotation.

Signed-off-by Arnd Bergmann <[email protected]>
Cc Pawel Moll <[email protected]>
Cc arm at kernel.org
---
 drivers/mfd/vexpress-sysreg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/vexpress-sysreg.c +1 -1
index 77048b1..558c292 100644
@@ -313,7 +313,7 @@ static void vexpress_sysreg_config_complete(unsigned long data)
 }
 
 
-void __init vexpress_sysreg_setup(struct device_node *node)
+void vexpress_sysreg_setup(struct device_node *node)
 {
 	if (WARN_ON(!vexpress_sysreg_base))
 		return;
Signature · 1 line
1.8.0
#1 lore raw

PATCH 1/1 mfd/vexpress: vexpress_sysreg_setup must not be __init

Quoted 16 lines · Arnd Bergmann

The patch 52666298a 'mfd: vexpress-sysreg: Don't skip initialization on probe' adds a call to vexpress_sysreg_setup from a non-__init function, so this also has to lose its __init annotation.

Signed-off-by Arnd Bergmann <[email protected]>
Cc Pawel Moll <[email protected]>
Cc arm at kernel.org
---
 drivers/mfd/vexpress-sysreg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/vexpress-sysreg.c +0 -0
index 77048b1..558c292 100644

drivers/mfd/vexpress-sysreg.c static void vexpress_sysreg_config_complete(unsigned long data) · line 319

Quoted 8 lines
drivers/mfd/vexpress-sysreg.c +1 -1
@@ -313,7 +313,7 @@ static void vexpress_sysreg_config_complete(unsigned long data)
 }
 
 
-void __init vexpress_sysreg_setup(struct device_node *node)
+void vexpress_sysreg_setup(struct device_node *node)
 {
 	if (WARN_ON(!vexpress_sysreg_base))
 		return;
Acked-by Pawel Moll <[email protected]>

Thanks!

Pawel