diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2011-01-06 22:02:15 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:47:45 -0500 |
commit | 95d210ce6b23ec8916f97ec0cc7eb4d5fa80e0b3 (patch) | |
tree | cff7518c0314539b142056ac5fc27741eb5c221b /arch/sh | |
parent | 144cd59687fd69e806411391e1ab044473bb5f72 (diff) |
sh: Use device_initcall() instead of __initcall()
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/board-edosk7705.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/board-edosk7760.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-cayman/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-landisk/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-r2d/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-sdk7786/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7206/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7751/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh03/setup.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/arch/sh/boards/board-edosk7705.c b/arch/sh/boards/board-edosk7705.c index 4cb3bb74c36f..541d8a281035 100644 --- a/arch/sh/boards/board-edosk7705.c +++ b/arch/sh/boards/board-edosk7705.c | |||
@@ -66,7 +66,7 @@ static int __init init_edosk7705_devices(void) | |||
66 | return platform_add_devices(edosk7705_devices, | 66 | return platform_add_devices(edosk7705_devices, |
67 | ARRAY_SIZE(edosk7705_devices)); | 67 | ARRAY_SIZE(edosk7705_devices)); |
68 | } | 68 | } |
69 | __initcall(init_edosk7705_devices); | 69 | device_initcall(init_edosk7705_devices); |
70 | 70 | ||
71 | /* | 71 | /* |
72 | * The Machine Vector | 72 | * The Machine Vector |
diff --git a/arch/sh/boards/board-edosk7760.c b/arch/sh/boards/board-edosk7760.c index 35dc0994875d..f47ac82da876 100644 --- a/arch/sh/boards/board-edosk7760.c +++ b/arch/sh/boards/board-edosk7760.c | |||
@@ -182,7 +182,7 @@ static int __init init_edosk7760_devices(void) | |||
182 | return platform_add_devices(edosk7760_devices, | 182 | return platform_add_devices(edosk7760_devices, |
183 | ARRAY_SIZE(edosk7760_devices)); | 183 | ARRAY_SIZE(edosk7760_devices)); |
184 | } | 184 | } |
185 | __initcall(init_edosk7760_devices); | 185 | device_initcall(init_edosk7760_devices); |
186 | 186 | ||
187 | /* | 187 | /* |
188 | * The Machine Vector | 188 | * The Machine Vector |
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index fe7e686c94ac..ee65ff05c558 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c | |||
@@ -284,7 +284,7 @@ static int __init sh7785lcr_devices_setup(void) | |||
284 | return platform_add_devices(sh7785lcr_devices, | 284 | return platform_add_devices(sh7785lcr_devices, |
285 | ARRAY_SIZE(sh7785lcr_devices)); | 285 | ARRAY_SIZE(sh7785lcr_devices)); |
286 | } | 286 | } |
287 | __initcall(sh7785lcr_devices_setup); | 287 | device_initcall(sh7785lcr_devices_setup); |
288 | 288 | ||
289 | /* Initialize IRQ setting */ | 289 | /* Initialize IRQ setting */ |
290 | void __init init_sh7785lcr_IRQ(void) | 290 | void __init init_sh7785lcr_IRQ(void) |
diff --git a/arch/sh/boards/mach-cayman/setup.c b/arch/sh/boards/mach-cayman/setup.c index 7e8216ac31bd..e89e8e122a26 100644 --- a/arch/sh/boards/mach-cayman/setup.c +++ b/arch/sh/boards/mach-cayman/setup.c | |||
@@ -165,7 +165,7 @@ static int __init smsc_superio_setup(void) | |||
165 | 165 | ||
166 | return 0; | 166 | return 0; |
167 | } | 167 | } |
168 | __initcall(smsc_superio_setup); | 168 | device_initcall(smsc_superio_setup); |
169 | 169 | ||
170 | static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len) | 170 | static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len) |
171 | { | 171 | { |
diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c index c69312165f74..94186cf079b6 100644 --- a/arch/sh/boards/mach-landisk/setup.c +++ b/arch/sh/boards/mach-landisk/setup.c | |||
@@ -81,7 +81,7 @@ static int __init landisk_devices_setup(void) | |||
81 | ARRAY_SIZE(landisk_devices)); | 81 | ARRAY_SIZE(landisk_devices)); |
82 | } | 82 | } |
83 | 83 | ||
84 | __initcall(landisk_devices_setup); | 84 | device_initcall(landisk_devices_setup); |
85 | 85 | ||
86 | static void __init landisk_setup(char **cmdline_p) | 86 | static void __init landisk_setup(char **cmdline_p) |
87 | { | 87 | { |
diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c index b84df6a3a93c..4b98a5251f83 100644 --- a/arch/sh/boards/mach-r2d/setup.c +++ b/arch/sh/boards/mach-r2d/setup.c | |||
@@ -258,7 +258,7 @@ static int __init rts7751r2d_devices_setup(void) | |||
258 | return platform_add_devices(rts7751r2d_devices, | 258 | return platform_add_devices(rts7751r2d_devices, |
259 | ARRAY_SIZE(rts7751r2d_devices)); | 259 | ARRAY_SIZE(rts7751r2d_devices)); |
260 | } | 260 | } |
261 | __initcall(rts7751r2d_devices_setup); | 261 | device_initcall(rts7751r2d_devices_setup); |
262 | 262 | ||
263 | static void rts7751r2d_power_off(void) | 263 | static void rts7751r2d_power_off(void) |
264 | { | 264 | { |
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c index 5b302d690ee5..1521aa75ee3a 100644 --- a/arch/sh/boards/mach-sdk7786/setup.c +++ b/arch/sh/boards/mach-sdk7786/setup.c | |||
@@ -135,7 +135,7 @@ static int __init sdk7786_devices_setup(void) | |||
135 | 135 | ||
136 | return sdk7786_i2c_setup(); | 136 | return sdk7786_i2c_setup(); |
137 | } | 137 | } |
138 | __initcall(sdk7786_devices_setup); | 138 | device_initcall(sdk7786_devices_setup); |
139 | 139 | ||
140 | static int sdk7786_mode_pins(void) | 140 | static int sdk7786_mode_pins(void) |
141 | { | 141 | { |
diff --git a/arch/sh/boards/mach-se/7206/setup.c b/arch/sh/boards/mach-se/7206/setup.c index 33039e0dc568..8ab8330e3fd1 100644 --- a/arch/sh/boards/mach-se/7206/setup.c +++ b/arch/sh/boards/mach-se/7206/setup.c | |||
@@ -77,7 +77,7 @@ static int __init se7206_devices_setup(void) | |||
77 | { | 77 | { |
78 | return platform_add_devices(se7206_devices, ARRAY_SIZE(se7206_devices)); | 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 | static int se7206_mode_pins(void) | 82 | static int se7206_mode_pins(void) |
83 | { | 83 | { |
diff --git a/arch/sh/boards/mach-se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c index 9fbc51beb181..4ed60c5e221f 100644 --- a/arch/sh/boards/mach-se/7751/setup.c +++ b/arch/sh/boards/mach-se/7751/setup.c | |||
@@ -48,7 +48,7 @@ static int __init se7751_devices_setup(void) | |||
48 | { | 48 | { |
49 | return platform_add_devices(se7751_devices, ARRAY_SIZE(se7751_devices)); | 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 | * The Machine Vector | 54 | * The Machine Vector |
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c index af4a0c012a96..d4f79b2a6514 100644 --- a/arch/sh/boards/mach-sh03/setup.c +++ b/arch/sh/boards/mach-sh03/setup.c | |||
@@ -96,7 +96,7 @@ static int __init sh03_devices_setup(void) | |||
96 | 96 | ||
97 | return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices)); | 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 | static struct sh_machine_vector mv_sh03 __initmv = { | 101 | static struct sh_machine_vector mv_sh03 __initmv = { |
102 | .mv_name = "Interface (CTP/PCI-SH03)", | 102 | .mv_name = "Interface (CTP/PCI-SH03)", |