of: Merge of_device_alloc() and of_device_make_bus_id()

This patch merges the common routines of_device_alloc() and
of_device_make_bus_id() from powerpc and microblaze.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
CC: Michal Simek <monstr@monstr.eu>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: microblaze-uclinux@itee.uq.edu.au
CC: linuxppc-dev@ozlabs.org
CC: devicetree-discuss@lists.ozlabs.org

8 files changed, 92 insertions, 175 deletions

diff --git a/arch/microblaze/include/asm/of_device.h b/arch/microblaze/include/asm/of_device.h
index c9be53487434..47e8d42aee8f 100644
--- a/arch/microblaze/include/asm/of_device.h
+++ b/arch/microblaze/include/asm/of_device.h
@@ -10,19 +10,4 @@
 
 #ifndef _ASM_MICROBLAZE_OF_DEVICE_H
 #define _ASM_MICROBLAZE_OF_DEVICE_H
-#ifdef __KERNEL__
-
-#include <linux/device.h>
-#include <linux/of.h>
-
-extern struct of_device *of_device_alloc(struct device_node *np,
-                                         const char *bus_id,
-                                         struct device *parent);
-
-extern void of_device_make_bus_id(struct of_device *dev);
-
-/* This is just here during the transition */
-#include <linux/of_device.h>
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_MICROBLAZE_OF_DEVICE_H */
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile
index e51bc1520825..727e2cbff9c6 100644
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@ -15,7 +15,7 @@ endif
 extra-y := head.o vmlinux.lds
 
 obj-y += dma.o exceptions.o \
-        hw_exception_handler.o init_task.o intc.o irq.o of_device.o \
+        hw_exception_handler.o init_task.o intc.o irq.o \
         of_platform.o process.o prom.o prom_parse.o ptrace.o \
         setup.o signal.o sys_microblaze.o timer.o traps.o reset.o
 
diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
deleted file mode 100644
index 3a367d788451..000000000000
--- a/arch/microblaze/kernel/of_device.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/of.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mod_devicetable.h>
-#include <linux/slab.h>
-#include <linux/of_device.h>
-
-#include <linux/errno.h>
-
-void of_device_make_bus_id(struct of_device *dev)
-{
-        static atomic_t bus_no_reg_magic;
-        struct device_node *node = dev->dev.of_node;
-        const u32 *reg;
-        u64 addr;
-        int magic;
-
-        /*
-         * For MMIO, get the physical address
-         */
-        reg = of_get_property(node, "reg", NULL);
-        if (reg) {
-                addr = of_translate_address(node, reg);
-                if (addr != OF_BAD_ADDR) {
-                        dev_set_name(&dev->dev, "%llx.%s",
-                                     (unsigned long long)addr, node->name);
-                        return;
-                }
-        }
-
-        /*
-         * No BusID, use the node name and add a globally incremented
-         * counter (and pray...)
-         */
-        magic = atomic_add_return(1, &bus_no_reg_magic);
-        dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1);
-}
-EXPORT_SYMBOL(of_device_make_bus_id);
-
-struct of_device *of_device_alloc(struct device_node *np,
-                                  const char *bus_id,
-                                  struct device *parent)
-{
-        struct of_device *dev;
-
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return NULL;
-
-        dev->dev.of_node = of_node_get(np);
-        dev->dev.dma_mask = &dev->archdata.dma_mask;
-        dev->dev.parent = parent;
-        dev->dev.release = of_release_dev;
-
-        if (bus_id)
-                dev_set_name(&dev->dev, bus_id);
-        else
-                of_device_make_bus_id(dev);
-
-        return dev;
-}
-EXPORT_SYMBOL(of_device_alloc);
diff --git a/arch/powerpc/include/asm/of_device.h b/arch/powerpc/include/asm/of_device.h
index 5d5103cac641..04f76717f82c 100644
--- a/arch/powerpc/include/asm/of_device.h
+++ b/arch/powerpc/include/asm/of_device.h
@@ -1,13 +1,3 @@
 #ifndef _ASM_POWERPC_OF_DEVICE_H
 #define _ASM_POWERPC_OF_DEVICE_H
-#ifdef __KERNEL__
-
-#include <linux/device.h>
-#include <linux/of.h>
-
-extern struct of_device *of_device_alloc(struct device_node *np,
-                                         const char *bus_id,
-                                         struct device *parent);
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_OF_DEVICE_H */
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 58d0572de6f9..83aa1fd0908f 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
-obj-$(CONFIG_PPC_OF)            += of_device.o of_platform.o prom_parse.o
+obj-$(CONFIG_PPC_OF)            += of_platform.o prom_parse.o
 obj-$(CONFIG_PPC_CLOCK)         += clock.o
 procfs-y                        := proc_powerpc.o
 obj-$(CONFIG_PROC_FS)           += $(procfs-y)
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
deleted file mode 100644
index db91a9dbafb5..000000000000
--- a/arch/powerpc/kernel/of_device.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/of.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mod_devicetable.h>
-#include <linux/slab.h>
-#include <linux/of_device.h>
-
-#include <asm/errno.h>
-#include <asm/dcr.h>
-
-static void of_device_make_bus_id(struct of_device *dev)
-{
-        static atomic_t bus_no_reg_magic;
-        struct device_node *node = dev->dev.of_node;
-        const u32 *reg;
-        u64 addr;
-        int magic;
-
-        /*
-         * If it's a DCR based device, use 'd' for native DCRs
-         * and 'D' for MMIO DCRs.
-         */
-#ifdef CONFIG_PPC_DCR
-        reg = of_get_property(node, "dcr-reg", NULL);
-        if (reg) {
-#ifdef CONFIG_PPC_DCR_NATIVE
-                dev_set_name(&dev->dev, "d%x.%s", *reg, node->name);
-#else /* CONFIG_PPC_DCR_NATIVE */
-                addr = of_translate_dcr_address(node, *reg, NULL);
-                if (addr != OF_BAD_ADDR) {
-                        dev_set_name(&dev->dev, "D%llx.%s",
-                                     (unsigned long long)addr, node->name);
-                        return;
-                }
-#endif /* !CONFIG_PPC_DCR_NATIVE */
-        }
-#endif /* CONFIG_PPC_DCR */
-
-        /*
-         * For MMIO, get the physical address
-         */
-        reg = of_get_property(node, "reg", NULL);
-        if (reg) {
-                addr = of_translate_address(node, reg);
-                if (addr != OF_BAD_ADDR) {
-                        dev_set_name(&dev->dev, "%llx.%s",
-                                     (unsigned long long)addr, node->name);
-                        return;
-                }
-        }
-
-        /*
-         * No BusID, use the node name and add a globally incremented
-         * counter (and pray...)
-         */
-        magic = atomic_add_return(1, &bus_no_reg_magic);
-        dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1);
-}
-
-struct of_device *of_device_alloc(struct device_node *np,
-                                  const char *bus_id,
-                                  struct device *parent)
-{
-        struct of_device *dev;
-
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
-        if (!dev)
-                return NULL;
-
-        dev->dev.of_node = of_node_get(np);
-        dev->dev.dma_mask = &dev->archdata.dma_mask;
-        dev->dev.parent = parent;
-        dev->dev.release = of_release_dev;
-
-        if (bus_id)
-                dev_set_name(&dev->dev, "%s", bus_id);
-        else
-                of_device_make_bus_id(dev);
-
-        return dev;
-}
-EXPORT_SYMBOL(of_device_alloc);
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d9c81e93bdd0..ea87a3cf7860 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -408,6 +408,93 @@ EXPORT_SYMBOL(of_unregister_driver);
  */
 
 /**
+ * of_device_make_bus_id - Use the device node data to assign a unique name
+ * @dev: pointer to device structure that is linked to a device tree node
+ *
+ * This routine will first try using either the dcr-reg or the reg property
+ * value to derive a unique name.  As a last resort it will use the node
+ * name followed by a unique number.
+ */
+static void of_device_make_bus_id(struct device *dev)
+{
+        static atomic_t bus_no_reg_magic;
+        struct device_node *node = dev->of_node;
+        const u32 *reg;
+        u64 addr;
+        int magic;
+
+#ifdef CONFIG_PPC_DCR
+        /*
+         * If it's a DCR based device, use 'd' for native DCRs
+         * and 'D' for MMIO DCRs.
+         */
+        reg = of_get_property(node, "dcr-reg", NULL);
+        if (reg) {
+#ifdef CONFIG_PPC_DCR_NATIVE
+                dev_set_name(dev, "d%x.%s", *reg, node->name);
+#else /* CONFIG_PPC_DCR_NATIVE */
+                u64 addr = of_translate_dcr_address(node, *reg, NULL);
+                if (addr != OF_BAD_ADDR) {
+                        dev_set_name(dev, "D%llx.%s",
+                                     (unsigned long long)addr, node->name);
+                        return;
+                }
+#endif /* !CONFIG_PPC_DCR_NATIVE */
+        }
+#endif /* CONFIG_PPC_DCR */
+
+        /*
+         * For MMIO, get the physical address
+         */
+        reg = of_get_property(node, "reg", NULL);
+        if (reg) {
+                addr = of_translate_address(node, reg);
+                if (addr != OF_BAD_ADDR) {
+                        dev_set_name(dev, "%llx.%s",
+                                     (unsigned long long)addr, node->name);
+                        return;
+                }
+        }
+
+        /*
+         * No BusID, use the node name and add a globally incremented
+         * counter (and pray...)
+         */
+        magic = atomic_add_return(1, &bus_no_reg_magic);
+        dev_set_name(dev, "%s.%d", node->name, magic - 1);
+}
+
+/**
+ * of_device_alloc - Allocate and initialize an of_device
+ * @np: device node to assign to device
+ * @bus_id: Name to assign to the device.  May be null to use default name.
+ * @parent: Parent device.
+ */
+struct of_device *of_device_alloc(struct device_node *np,
+                                  const char *bus_id,
+                                  struct device *parent)
+{
+        struct of_device *dev;
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+
+        dev->dev.of_node = of_node_get(np);
+        dev->dev.dma_mask = &dev->archdata.dma_mask;
+        dev->dev.parent = parent;
+        dev->dev.release = of_release_dev;
+
+        if (bus_id)
+                dev_set_name(&dev->dev, "%s", bus_id);
+        else
+                of_device_make_bus_id(&dev->dev);
+
+        return dev;
+}
+EXPORT_SYMBOL(of_device_alloc);
+
+/**
  * of_platform_device_create - Alloc, initialize and register an of_device
  * @np: pointer to node to create device for
  * @bus_id: name to assign device
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 4bbba41396ef..a51fd30176aa 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -60,6 +60,9 @@ static inline void of_unregister_platform_driver(struct of_platform_driver *drv)
         of_unregister_driver(drv);
 }
 
+extern struct of_device *of_device_alloc(struct device_node *np,
+                                         const char *bus_id,
+                                         struct device *parent);
 #include <asm/of_platform.h>
 
 extern struct of_device *of_find_device_by_node(struct device_node *np);