of: Merge of_platform_bus_type with platform_bus_type

of_platform_bus was being used in the same manner as the platform_bus.
The only difference being that of_platform_bus devices are generated
from data in the device tree, and platform_bus devices are usually
statically allocated in platform code.  Having them separate causes
the problem of device drivers having to be registered twice if it
was possible for the same device to appear on either bus.

This patch removes of_platform_bus_type and registers all of_platform
bus devices and drivers on the platform bus instead.  A previous patch
made the of_device structure an alias for the platform_device structure,
and a shim is used to adapt of_platform_drivers to the platform bus.

After all of of_platform_bus drivers are converted to be normal platform
drivers, the shim code can be removed.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 16 deletions

diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 5e8cbb942d3..9743d1d9fa0 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)
 {