1 files changed, 28 insertions, 145 deletions

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 397c83eda20e..8a06724e029e 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -9,30 +9,26 @@
 #include <asm/of_device.h>
 
 /**
- * of_match_device - Tell if an of_device structure has a matching
- * of_match structure
+ * of_match_node - Tell if an device_node has a matching of_match structure
  * @ids: array of of device match structures to search in
- * @dev: the of device structure to match against
+ * @node: the of device structure to match against
  *
- * Used by a driver to check whether an of_device present in the
- * system is in its list of supported devices.
+ * Low level utility function used by device matching.
  */
-const struct of_device_id *of_match_device(const struct of_device_id *matches,
-                                        const struct of_device *dev)
+const struct of_device_id *of_match_node(const struct of_device_id *matches,
+                                         const struct device_node *node)
 {
-        if (!dev->node)
-                return NULL;
         while (matches->name[0] || matches->type[0] || matches->compatible[0]) {
                 int match = 1;
                 if (matches->name[0])
-                        match &= dev->node->name
-                                && !strcmp(matches->name, dev->node->name);
+                        match &= node->name
+                                && !strcmp(matches->name, node->name);
                 if (matches->type[0])
-                        match &= dev->node->type
-                                && !strcmp(matches->type, dev->node->type);
+                        match &= node->type
+                                && !strcmp(matches->type, node->type);
                 if (matches->compatible[0])
-                        match &= device_is_compatible(dev->node,
-                                matches->compatible);
+                        match &= device_is_compatible(node,
+                                                      matches->compatible);
                 if (match)
                         return matches;
                 matches++;
@@ -40,16 +36,21 @@ const struct of_device_id *of_match_device(const struct of_device_id *matches,
         return NULL;
 }
 
-static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
+/**
+ * of_match_device - Tell if an of_device structure has a matching
+ * of_match structure
+ * @ids: array of of device match structures to search in
+ * @dev: the of device structure to match against
+ *
+ * Used by a driver to check whether an of_device present in the
+ * system is in its list of supported devices.
+ */
+const struct of_device_id *of_match_device(const struct of_device_id *matches,
+                                        const struct of_device *dev)
 {
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * of_drv = to_of_platform_driver(drv);
-        const struct of_device_id * matches = of_drv->match_table;
-
-        if (!matches)
-                return 0;
-
-        return of_match_device(matches, of_dev) != NULL;
+        if (!dev->node)
+                return NULL;
+        return of_match_node(matches, dev->node);
 }
 
 struct of_device *of_dev_get(struct of_device *dev)
@@ -71,96 +72,8 @@ void of_dev_put(struct of_device *dev)
                 put_device(&dev->dev);
 }
 
-
-static int of_device_probe(struct device *dev)
-{
-        int error = -ENODEV;
-        struct of_platform_driver *drv;
-        struct of_device *of_dev;
-        const struct of_device_id *match;
-
-        drv = to_of_platform_driver(dev->driver);
-        of_dev = to_of_device(dev);
-
-        if (!drv->probe)
-                return error;
-
-        of_dev_get(of_dev);
-
-        match = of_match_device(drv->match_table, of_dev);
-        if (match)
-                error = drv->probe(of_dev, match);
-        if (error)
-                of_dev_put(of_dev);
-
-        return error;
-}
-
-static int of_device_remove(struct device *dev)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-
-        if (dev->driver && drv->remove)
-                drv->remove(of_dev);
-        return 0;
-}
-
-static int of_device_suspend(struct device *dev, pm_message_t state)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-        int error = 0;
-
-        if (dev->driver && drv->suspend)
-                error = drv->suspend(of_dev, state);
-        return error;
-}
-
-static int of_device_resume(struct device * dev)
-{
-        struct of_device * of_dev = to_of_device(dev);
-        struct of_platform_driver * drv = to_of_platform_driver(dev->driver);
-        int error = 0;
-
-        if (dev->driver && drv->resume)
-                error = drv->resume(of_dev);
-        return error;
-}
-
-struct bus_type of_platform_bus_type = {
-       .name    = "of_platform",
-       .match   = of_platform_bus_match,
-       .probe   = of_device_probe,
-       .remove  = of_device_remove,
-       .suspend = of_device_suspend,
-       .resume  = of_device_resume,
-};
-
-static int __init of_bus_driver_init(void)
-{
-        return bus_register(&of_platform_bus_type);
-}
-
-postcore_initcall(of_bus_driver_init);
-
-int of_register_driver(struct of_platform_driver *drv)
-{
-        /* initialize common driver fields */
-        drv->driver.name = drv->name;
-        drv->driver.bus = &of_platform_bus_type;
-
-        /* register with core */
-        return driver_register(&drv->driver);
-}
-
-void of_unregister_driver(struct of_platform_driver *drv)
-{
-        driver_unregister(&drv->driver);
-}
-
-
-static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t dev_show_devspec(struct device *dev,
+                                struct device_attribute *attr, char *buf)
 {
         struct of_device *ofdev;
 
@@ -208,41 +121,11 @@ void of_device_unregister(struct of_device *ofdev)
         device_unregister(&ofdev->dev);
 }
 
-struct of_device* of_platform_device_create(struct device_node *np,
-                                            const char *bus_id,
-                                            struct device *parent)
-{
-        struct of_device *dev;
-
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return NULL;
-        memset(dev, 0, sizeof(*dev));
-
-        dev->node = of_node_get(np);
-        dev->dma_mask = 0xffffffffUL;
-        dev->dev.dma_mask = &dev->dma_mask;
-        dev->dev.parent = parent;
-        dev->dev.bus = &of_platform_bus_type;
-        dev->dev.release = of_release_dev;
-
-        strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
-
-        if (of_device_register(dev) != 0) {
-                kfree(dev);
-                return NULL;
-        }
-
-        return dev;
-}
 
+EXPORT_SYMBOL(of_match_node);
 EXPORT_SYMBOL(of_match_device);
-EXPORT_SYMBOL(of_platform_bus_type);
-EXPORT_SYMBOL(of_register_driver);
-EXPORT_SYMBOL(of_unregister_driver);
 EXPORT_SYMBOL(of_device_register);
 EXPORT_SYMBOL(of_device_unregister);
 EXPORT_SYMBOL(of_dev_get);
 EXPORT_SYMBOL(of_dev_put);
-EXPORT_SYMBOL(of_platform_device_create);
 EXPORT_SYMBOL(of_release_dev);