Skip to contentSkip to conversation

of: make of_find_device_by_node generic

PATCH In review Grant Likely 2 participants 2 messages Jul 23, 2010

Subsystems (4)
PowerPC SPARC + UltraSPARC (sparc/sparc64) Device tree Microblaze architecture
lore
Share & tools
lore

Grant Likely

author
#0 lore raw

PATCH 1/1 of: make of_find_device_by_node generic

From: Jonas Bonn <[email protected]>

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 <[email protected]>
[[email protected]: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment]
Signed-off-by Grant Likely <[email protected]>
---
 arch/microblaze/kernel/of_platform.c |   16 ----------------
 arch/powerpc/kernel/of_platform.c    |   16 ----------------
 arch/sparc/kernel/of_device_common.c |   20 --------------------
 drivers/of/platform.c                |   20 ++++++++++++++++++++
 4 files changed, 20 insertions(+), 52 deletions(-)
arch/microblaze/kernel/of_platform.c +0 -16
index c664b27..6cffadb 100644
@@ -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);
arch/powerpc/kernel/of_platform.c +0 -16
index 84439d1..760a7af 100644
@@ -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
arch/sparc/kernel/of_device_common.c +0 -20
index e80729b..49ddff5 100644
@@ -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);
drivers/of/platform.c +20 -0
index 9b2d5b1..9126064 100644
@@ -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;
maintainer Acked-by on v1 1/1
#1 lore raw

From: Grant Likely <[email protected]>
Date: Fri, 23 Jul 2010 14:02:17 -0600

Quoted 9 lines

From: Jonas Bonn <[email protected]>

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 <[email protected]>
[[email protected]: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment]
Signed-off-by Grant Likely <[email protected]>
Acked-by David S. Miller <[email protected]>