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-bockw.c

diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index b4e4789..8a83eb3 100644 (file)
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -179,7 +179,7 @@ static struct renesas_usbhs_platform_info usbhs_info __initdata = {
 #define USB1_DEVICE    "renesas_usbhs"
 #define ADD_USB_FUNC_DEVICE_IF_POSSIBLE()                      \
        platform_device_register_resndata(                      \
-               &platform_bus, "renesas_usbhs", -1,             \
+               NULL, "renesas_usbhs", -1,                      \
                usbhsf_resources,                               \
                ARRAY_SIZE(usbhsf_resources),                   \
                &usbhs_info, sizeof(struct renesas_usbhs_platform_info))
@@ -238,7 +238,6 @@ static struct sh_eth_plat_data ether_platform_data __initdata = {
 };
 
 static struct platform_device_info ether_info __initdata = {
-       .parent         = &platform_bus,
        .name           = "r8a777x-ether",
        .id             = -1,
        .res            = ether_resources,
@@ -324,7 +323,6 @@ static struct resource vin##idx##_resources[] __initdata = {                \
 };                                                                     \
                                                                        \
 static struct platform_device_info vin##idx##_info __initdata = {      \
-       .parent         = &platform_bus,                                \
        .name           = "r8a7778-vin",                                \
        .id             = idx,                                          \
        .res            = vin##idx##_resources,                         \
@@ -623,10 +621,10 @@ static void __init bockw_init(void)
        /* VIN1 has a pin conflict with Ether */
        if (!IS_ENABLED(CONFIG_SH_ETH))
                platform_device_register_full(&vin1_info);
-       platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
+       platform_device_register_data(NULL, "soc-camera-pdrv", 0,
                                      &iclink0_ml86v7667,
                                      sizeof(iclink0_ml86v7667));
-       platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
+       platform_device_register_data(NULL, "soc-camera-pdrv", 1,
                                      &iclink1_ml86v7667,
                                      sizeof(iclink1_ml86v7667));
 
@@ -639,12 +637,12 @@ static void __init bockw_init(void)
        r8a7778_pinmux_init();
 
        platform_device_register_resndata(
-               &platform_bus, "sh_mmcif", -1,
+               NULL, "sh_mmcif", -1,
                mmc_resources, ARRAY_SIZE(mmc_resources),
                &sh_mmcif_plat, sizeof(struct sh_mmcif_plat_data));
 
        platform_device_register_resndata(
-               &platform_bus, "rcar_usb_phy", -1,
+               NULL, "rcar_usb_phy", -1,
                usb_phy_resources,
                ARRAY_SIZE(usb_phy_resources),
                &usb_phy_platform_data,
@@ -670,7 +668,7 @@ static void __init bockw_init(void)
                iowrite16(val, fpga + IRQ0MR);
 
                platform_device_register_resndata(
-                       &platform_bus, "smsc911x", -1,
+                       NULL, "smsc911x", -1,
                        smsc911x_resources, ARRAY_SIZE(smsc911x_resources),
                        &smsc911x_data, sizeof(smsc911x_data));
        }
@@ -687,7 +685,7 @@ static void __init bockw_init(void)
                iounmap(base);
 
                platform_device_register_resndata(
-                       &platform_bus, "sh_mobile_sdhi", 0,
+                       NULL, "sh_mobile_sdhi", 0,
                        sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                        &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
        }
@@ -702,7 +700,7 @@ static void __init bockw_init(void)
                "ak4554-adc-dac", 1, NULL, 0);
 
        pdev = platform_device_register_resndata(
-               &platform_bus, "rcar_sound", -1,
+               NULL, "rcar_sound", -1,
                rsnd_resources, ARRAY_SIZE(rsnd_resources),
                &rsnd_info, sizeof(rsnd_info));
 
@@ -712,7 +710,6 @@ static void __init bockw_init(void)
 
        for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {
                struct platform_device_info cardinfo = {
-                       .parent         = &platform_bus,
                        .name           = "asoc-simple-card",
                        .id             = i,
                        .data           = &rsnd_card_info[i],