11 files changed, 13 insertions, 87 deletions

diff --git a/arch/microblaze/kernel/of_platform.c b/arch/microblaze/kernel/of_platform.c
index da79edf45420..fb2866104331 100644
--- a/arch/microblaze/kernel/of_platform.c
+++ b/arch/microblaze/kernel/of_platform.c
@@ -26,17 +26,6 @@
 #include <linux/topology.h>
 #include <asm/atomic.h>
 
-struct bus_type of_platform_bus_type = {
-       .uevent  = of_device_uevent,
-};
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static int __init of_bus_driver_init(void)
-{
-        return of_bus_type_init(&of_platform_bus_type, "of_platform");
-}
-postcore_initcall(of_bus_driver_init);
-
 /*
  * The list of OF IDs below is used for matching bus types in the
  * system whose devices are to be exposed as of_platform_devices.
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 17c98dbcec88..f5f768842354 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -213,15 +213,9 @@ static struct notifier_block dflt_plat_bus_notifier = {
         .priority = INT_MAX,
 };
 
-static struct notifier_block dflt_of_bus_notifier = {
-        .notifier_call = dflt_bus_notify,
-        .priority = INT_MAX,
-};
-
 static int __init setup_bus_notifier(void)
 {
         bus_register_notifier(&platform_bus_type, &dflt_plat_bus_notifier);
-        bus_register_notifier(&of_platform_bus_type, &dflt_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index 02f724f36753..4295e0b94b2d 100644
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -82,17 +82,9 @@ static struct notifier_block ppc_swiotlb_plat_bus_notifier = {
         .priority = 0,
 };
 
-static struct notifier_block ppc_swiotlb_of_bus_notifier = {
-        .notifier_call = ppc_swiotlb_bus_notify,
-        .priority = 0,
-};
-
 int __init swiotlb_setup_bus_notifier(void)
 {
         bus_register_notifier(&platform_bus_type,
                               &ppc_swiotlb_plat_bus_notifier);
-        bus_register_notifier(&of_platform_bus_type,
-                              &ppc_swiotlb_of_bus_notifier);
-
         return 0;
 }
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 4e0a2f7c1dd3..d3497cd81e8a 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -52,18 +52,6 @@ const struct of_device_id of_default_bus_ids[] = {
         {},
 };
 
-struct bus_type of_platform_bus_type = {
-       .uevent  = of_device_uevent,
-};
-EXPORT_SYMBOL(of_platform_bus_type);
-
-static int __init of_bus_driver_init(void)
-{
-        return of_bus_type_init(&of_platform_bus_type, "of_platform");
-}
-
-postcore_initcall(of_bus_driver_init);
-
 static int of_dev_node_match(struct device *dev, void *data)
 {
         return to_of_device(dev)->dev.of_node == data;
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index b7e6c7e193ae..d1a5304b3ddd 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -701,16 +701,9 @@ static struct notifier_block ppc_dflt_plat_bus_notifier = {
         .priority = INT_MAX,
 };
 
-static struct notifier_block ppc_dflt_of_bus_notifier = {
-        .notifier_call = ppc_dflt_bus_notify,
-        .priority = INT_MAX,
-};
-
 static int __init setup_bus_notifier(void)
 {
         bus_register_notifier(&platform_bus_type, &ppc_dflt_plat_bus_notifier);
-        bus_register_notifier(&of_platform_bus_type, &ppc_dflt_of_bus_notifier);
-
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/cell/beat_iommu.c b/arch/powerpc/platforms/cell/beat_iommu.c
index 39d361c5c6d2..beec405eb6f8 100644
--- a/arch/powerpc/platforms/cell/beat_iommu.c
+++ b/arch/powerpc/platforms/cell/beat_iommu.c
@@ -108,7 +108,7 @@ static int __init celleb_init_iommu(void)
         celleb_init_direct_mapping();
         set_pci_dma_ops(&dma_direct_ops);
         ppc_md.pci_dma_dev_setup = celleb_pci_dma_dev_setup;
-        bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &celleb_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 3712900471ba..58b13ce3847e 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -1204,7 +1204,7 @@ static int __init cell_iommu_init(void)
         /* Register callbacks on OF platform device addition/removal
          * to handle linking them to the right DMA operations
          */
-        bus_register_notifier(&of_platform_bus_type, &cell_of_bus_notifier);
+        bus_register_notifier(&platform_bus_type, &cell_of_bus_notifier);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index 31acd3b1718b..1398bc454999 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -20,12 +20,7 @@
 
 #include <asm/prom.h>
 
-/*
- * These functions provide the necessary setup for the mv64x60 drivers.
- * These drivers are unusual in that they work on both the MIPS and PowerPC
- * architectures.  Because of that, the drivers do not support the normal
- * PowerPC of_platform_bus_type.  They support platform_bus_type instead.
- */
+/* These functions provide the necessary setup for the mv64x60 drivers. */
 
 static struct of_device_id __initdata of_mv64x60_devices[] = {
         { .compatible = "marvell,mv64306-devctrl", },
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 331de91ad2bc..75fc9d5cd7e6 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -424,7 +424,7 @@ build_resources:
         build_device_resources(op, parent);
 
         op->dev.parent = parent;
-        op->dev.bus = &of_platform_bus_type;
+        op->dev.bus = &platform_bus_type;
         if (!parent)
                 dev_set_name(&op->dev, "root");
         else
@@ -452,30 +452,19 @@ static void __init scan_tree(struct device_node *dp, struct device *parent)
         }
 }
 
-static void __init scan_of_devices(void)
+static int __init scan_of_devices(void)
 {
         struct device_node *root = of_find_node_by_path("/");
         struct of_device *parent;
 
         parent = scan_one_device(root, NULL);
         if (!parent)
-                return;
+                return 0;
 
         scan_tree(root->child, &parent->dev);
+        return 0;
 }
-
-static int __init of_bus_driver_init(void)
-{
-        int err;
-
-        err = of_bus_type_init(&of_platform_bus_type, "of");
-        if (!err)
-                scan_of_devices();
-
-        return err;
-}
-
-postcore_initcall(of_bus_driver_init);
+postcore_initcall(scan_of_devices);
 
 static int __init of_debug(char *str)
 {
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 5e8cbb942d3d..9743d1d9fa03 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -667,7 +667,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                 op->archdata.irqs[i] = build_one_device_irq(op, parent, op->archdata.irqs[i]);
 
         op->dev.parent = parent;
-        op->dev.bus = &of_platform_bus_type;
+        op->dev.bus = &platform_bus_type;
         if (!parent)
                 dev_set_name(&op->dev, "root");
         else
@@ -695,30 +695,19 @@ static void __init scan_tree(struct device_node *dp, struct device *parent)
         }
 }
 
-static void __init scan_of_devices(void)
+static int __init scan_of_devices(void)
 {
         struct device_node *root = of_find_node_by_path("/");
         struct of_device *parent;
 
         parent = scan_one_device(root, NULL);
         if (!parent)
-                return;
+                return 0;
 
         scan_tree(root->child, &parent->dev);
+        return 0;
 }
-
-static int __init of_bus_driver_init(void)
-{
-        int err;
-
-        err = of_bus_type_init(&of_platform_bus_type, "of");
-        if (!err)
-                scan_of_devices();
-
-        return err;
-}
-
-postcore_initcall(of_bus_driver_init);
+postcore_initcall(scan_of_devices);
 
 static int __init of_debug(char *str)
 {
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index 016c947d4cae..01f380c7995c 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -64,9 +64,6 @@ void of_propagate_archdata(struct of_device *bus)
         }
 }
 
-struct bus_type of_platform_bus_type;
-EXPORT_SYMBOL(of_platform_bus_type);
-
 static void get_cells(struct device_node *dp, int *addrc, int *sizec)
 {
         if (addrc)