Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Use device_initcall() instead of __initcall()

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Nobuhiro Iwamatsu and committed by
Paul Mundt
95d210ce 144cd596

+10 -10
+1 -1
arch/sh/boards/board-edosk7705.c
··· 66 66 return platform_add_devices(edosk7705_devices, 67 67 ARRAY_SIZE(edosk7705_devices)); 68 68 } 69 - __initcall(init_edosk7705_devices); 69 + device_initcall(init_edosk7705_devices); 70 70 71 71 /* 72 72 * The Machine Vector
+1 -1
arch/sh/boards/board-edosk7760.c
··· 182 182 return platform_add_devices(edosk7760_devices, 183 183 ARRAY_SIZE(edosk7760_devices)); 184 184 } 185 - __initcall(init_edosk7760_devices); 185 + device_initcall(init_edosk7760_devices); 186 186 187 187 /* 188 188 * The Machine Vector
+1 -1
arch/sh/boards/board-sh7785lcr.c
··· 284 284 return platform_add_devices(sh7785lcr_devices, 285 285 ARRAY_SIZE(sh7785lcr_devices)); 286 286 } 287 - __initcall(sh7785lcr_devices_setup); 287 + device_initcall(sh7785lcr_devices_setup); 288 288 289 289 /* Initialize IRQ setting */ 290 290 void __init init_sh7785lcr_IRQ(void)
+1 -1
arch/sh/boards/mach-cayman/setup.c
··· 165 165 166 166 return 0; 167 167 } 168 - __initcall(smsc_superio_setup); 168 + device_initcall(smsc_superio_setup); 169 169 170 170 static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len) 171 171 {
+1 -1
arch/sh/boards/mach-landisk/setup.c
··· 81 81 ARRAY_SIZE(landisk_devices)); 82 82 } 83 83 84 - __initcall(landisk_devices_setup); 84 + device_initcall(landisk_devices_setup); 85 85 86 86 static void __init landisk_setup(char **cmdline_p) 87 87 {
+1 -1
arch/sh/boards/mach-r2d/setup.c
··· 258 258 return platform_add_devices(rts7751r2d_devices, 259 259 ARRAY_SIZE(rts7751r2d_devices)); 260 260 } 261 - __initcall(rts7751r2d_devices_setup); 261 + device_initcall(rts7751r2d_devices_setup); 262 262 263 263 static void rts7751r2d_power_off(void) 264 264 {
+1 -1
arch/sh/boards/mach-sdk7786/setup.c
··· 135 135 136 136 return sdk7786_i2c_setup(); 137 137 } 138 - __initcall(sdk7786_devices_setup); 138 + device_initcall(sdk7786_devices_setup); 139 139 140 140 static int sdk7786_mode_pins(void) 141 141 {
+1 -1
arch/sh/boards/mach-se/7206/setup.c
··· 77 77 { 78 78 return platform_add_devices(se7206_devices, ARRAY_SIZE(se7206_devices)); 79 79 } 80 - __initcall(se7206_devices_setup); 80 + device_initcall(se7206_devices_setup); 81 81 82 82 static int se7206_mode_pins(void) 83 83 {
+1 -1
arch/sh/boards/mach-se/7751/setup.c
··· 48 48 { 49 49 return platform_add_devices(se7751_devices, ARRAY_SIZE(se7751_devices)); 50 50 } 51 - __initcall(se7751_devices_setup); 51 + device_initcall(se7751_devices_setup); 52 52 53 53 /* 54 54 * The Machine Vector
+1 -1
arch/sh/boards/mach-sh03/setup.c
··· 96 96 97 97 return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices)); 98 98 } 99 - __initcall(sh03_devices_setup); 99 + device_initcall(sh03_devices_setup); 100 100 101 101 static struct sh_machine_vector mv_sh03 __initmv = { 102 102 .mv_name = "Interface (CTP/PCI-SH03)",