UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jonas Bonn 2010-07-23 19:19:35 +02:00 committed by Grant Likely
parent de48e369e8
commit c608558407
4 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/microblaze/kernel/of_platform.c
View File

@ -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);

16
arch/powerpc/kernel/of_platform.c
View File

@ -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

20
arch/sparc/kernel/of_device_common.c
View File

@ -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);

20
drivers/of/platform.c
View File

@ -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;