aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-04-01 21:19:17 -0700
committerSimon Horman <horms+renesas@verge.net.au>2013-04-04 15:37:12 +0900
commit814844871cb0ce6663579099ecb7fc80925df68c (patch)
tree39585899b00493f122373e5e23982b3f415dfb5c /arch/arm/mach-shmobile
parent8585deb18580d04209a2986430aa0959ef38fce2 (diff)
ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO()
remove pointless PLATFORM_INFO() macro from setup-r8a7778, and, used original platform_device_register_xxx() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7778.c26
1 files changed, 9 insertions, 17 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 01c62bedf9c..57d6b0eba44 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -78,21 +78,13 @@ static struct sh_timer_config sh_tmu1_platform_data = {
.clocksource_rating = 200,
};
-#define PLATFORM_INFO(n, i) \
-{ \
- .parent = &platform_bus, \
- .name = #n, \
- .id = i, \
- .res = n ## i ## _resources, \
- .num_res = ARRAY_SIZE(n ## i ##_resources), \
- .data = &n ## i ##_platform_data, \
- .size_data = sizeof(n ## i ## _platform_data), \
-}
-
-struct platform_device_info platform_devinfo[] = {
- PLATFORM_INFO(sh_tmu, 0),
- PLATFORM_INFO(sh_tmu, 1),
-};
+#define r8a7778_register_tmu(idx) \
+ platform_device_register_resndata( \
+ &platform_bus, "sh_tmu", idx, \
+ sh_tmu##idx##_resources, \
+ ARRAY_SIZE(sh_tmu##idx##_resources), \
+ &sh_tmu##idx##_platform_data, \
+ sizeof(sh_tmu##idx##_platform_data))
void __init r8a7778_add_standard_devices(void)
{
@@ -114,8 +106,8 @@ void __init r8a7778_add_standard_devices(void)
&scif_platform_data[i],
sizeof(struct plat_sci_port));
- for (i = 0; i < ARRAY_SIZE(platform_devinfo); i++)
- platform_device_register_full(&platform_devinfo[i]);
+ r8a7778_register_tmu(0);
+ r8a7778_register_tmu(1);
}
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */