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>

diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 01c62bedf9cf10d7e0e896ffe59ff811c1b91346..57d6b0eba4456dd736dccd23ae9cf5eadda00598 100644 (file)
--- 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 */