summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bonn <jonas@southpole.se>2010-07-23 19:19:35 +0200
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 09:58:22 -0600
commitc608558407aa64d2b98d58bfc116e95c0afb357e (patch)
tree1dba985555b1fff5ce587c6368f47383ba00ebd4
parentde48e369e8ea3a773cb2f959b76fcfad9966f4a0 (diff)
of: make of_find_device_by_node generic
There's no need for this function to be architecture specific and all four architectures defining it had the same definition. The function has been moved to drivers/of/platform.c. Signed-off-by: Jonas Bonn <jonas@southpole.se> [grant.likely@secretlab.ca: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment] Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/microblaze/kernel/of_platform.c16
-rw-r--r--arch/powerpc/kernel/of_platform.c16
-rw-r--r--arch/sparc/kernel/of_device_common.c20
-rw-r--r--drivers/of/platform.c20
4 files changed, 20 insertions, 52 deletions
diff --git a/arch/microblaze/kernel/of_platform.c b/arch/microblaze/kernel/of_platform.c
index c664b275a5fa..6cffadbe2fcd 100644
--- a/arch/microblaze/kernel/of_platform.c
+++ b/arch/microblaze/kernel/of_platform.c
@@ -47,19 +47,3 @@ const struct of_device_id of_default_bus_ids[] = {
{ .type = "simple", },
{},
};
-
-static int of_dev_node_match(struct device *dev, void *data)
-{
- return to_platform_device(dev)->dev.of_node == data;
-}
-
-struct platform_device *of_find_device_by_node(struct device_node *np)
-{
- struct device *dev;
-
- dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
- if (dev)
- return to_platform_device(dev);
- return NULL;
-}
-EXPORT_SYMBOL(of_find_device_by_node);
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 84439d1b7cb3..760a7af7fdb5 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -52,22 +52,6 @@ const struct of_device_id of_default_bus_ids[] = {
{},
};
-static int of_dev_node_match(struct device *dev, void *data)
-{
- return to_platform_device(dev)->dev.of_node == data;
-}
-
-struct platform_device *of_find_device_by_node(struct device_node *np)
-{
- struct device *dev;
-
- dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
- if (dev)
- return to_platform_device(dev);
- return NULL;
-}
-EXPORT_SYMBOL(of_find_device_by_node);
-
#ifdef CONFIG_PPC_OF_PLATFORM_PCI
/* The probing of PCI controllers from of_platform is currently
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index e80729bba028..49ddff56cb04 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -11,26 +11,6 @@
#include "of_device_common.h"
-static int node_match(struct device *dev, void *data)
-{
- struct platform_device *op = to_platform_device(dev);
- struct device_node *dp = data;
-
- return (op->dev.of_node == dp);
-}
-
-struct platform_device *of_find_device_by_node(struct device_node *dp)
-{
- struct device *dev = bus_find_device(&platform_bus_type, NULL,
- dp, node_match);
-
- if (dev)
- return to_platform_device(dev);
-
- return NULL;
-}
-EXPORT_SYMBOL(of_find_device_by_node);
-
unsigned int irq_of_parse_and_map(struct device_node *node, int index)
{
struct platform_device *op = of_find_device_by_node(node);
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 9f3840cdcde5..f79f40b516c6 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -22,6 +22,26 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
+static int of_dev_node_match(struct device *dev, void *data)
+{
+ return dev->of_node == data;
+}
+
+/**
+ * of_find_device_by_node - Find the platform_device associated with a node
+ * @np: Pointer to device tree node
+ *
+ * Returns platform_device pointer, or NULL if not found
+ */
+struct platform_device *of_find_device_by_node(struct device_node *np)
+{
+ struct device *dev;
+
+ dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
+ return dev ? to_platform_device(dev) : NULL;
+}
+EXPORT_SYMBOL(of_find_device_by_node);
+
static int platform_driver_probe_shim(struct platform_device *pdev)
{
struct platform_driver *pdrv;