Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / arch / arm / mach-shmobile / board-genmai.c

diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index e2a3ba4..7bf2d80 100644 (file)
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -48,7 +48,6 @@ static const struct resource ether_resources[] __initconst = {
 };
 
 static const struct platform_device_info ether_info __initconst = {
-       .parent         = &platform_bus,
        .name           = "r7s72100-ether",
        .id             = -1,
        .res            = ether_resources,
@@ -78,7 +77,7 @@ static const struct rspi_plat_data rspi_pdata __initconst = {
 };
 
 #define r7s72100_register_rspi(idx)                                       \
-       platform_device_register_resndata(&platform_bus, "rspi-rz", idx,   \
+       platform_device_register_resndata(NULL, "rspi-rz", idx,            \
                                        rspi##idx##_resources,             \
                                        ARRAY_SIZE(rspi##idx##_resources), \
                                        &rspi_pdata, sizeof(rspi_pdata))
@@ -120,7 +119,7 @@ R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
 R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
 
 #define r7s72100_register_scif(index)                                         \
-       platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+       platform_device_register_resndata(NULL, "sh-sci", index,               \
                                          scif##index##_resources,             \
                                          ARRAY_SIZE(scif##index##_resources), \
                                          &scif##index##_platform_data,        \