summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-03-18 10:21:29 -0600
committerGrant Likely <grant.likely@secretlab.ca>2011-03-23 14:55:56 -0600
commit1eed4c077c31450bfcd0249aebb21d96fc5d5d3c (patch)
treea5d7117d36989ea86b121ed53f711bfcbbbf8bd8 /drivers/of
parenta52f07ecd143baee51623b063be5007585748a4f (diff)
downloadlinux-1eed4c077c31450bfcd0249aebb21d96fc5d5d3c.tar.bz2
dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
There are no users of OF_NO_DEEP_PROBE, and of_match_node() now gracefully handles being passed a NULL pointer, so the checks at the top of of_platform_bus_probe can be dropped. While at it, consolidate the root node pointer check to be easier to read and tidy up related comments. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f489e36af892..63d3cb73bdb9 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL(of_platform_device_create);
/**
* of_platform_bus_create() - Create a device for a node and its children.
* @bus: device node of the bus to instantiate
- * @matches: match table, NULL to use the default, OF_NO_DEEP_PROBE to
+ * @matches: match table for bus nodes
* disallow recursive creation of child buses
* @parent: parent for new device, or NULL for top level.
*
@@ -245,7 +245,7 @@ static int of_platform_bus_create(struct device_node *bus,
/**
* of_platform_bus_probe() - Probe the device-tree for platform buses
* @root: parent of the first level to probe or NULL for the root of the tree
- * @matches: match table, NULL to use the default
+ * @matches: match table for bus nodes
* @parent: parent to hook devices from, NULL for toplevel
*
* Note that children of the provided root are not instantiated as devices
@@ -258,21 +258,14 @@ int of_platform_bus_probe(struct device_node *root,
struct device_node *child;
int rc = 0;
- if (WARN_ON(!matches || matches == OF_NO_DEEP_PROBE))
- return -EINVAL;
- if (root == NULL)
- root = of_find_node_by_path("/");
- else
- of_node_get(root);
- if (root == NULL)
+ root = root ? of_node_get(root) : of_find_node_by_path("/");
+ if (!root)
return -EINVAL;
pr_debug("of_platform_bus_probe()\n");
pr_debug(" starting at: %s\n", root->full_name);
- /* Do a self check of bus type, if there's a match, create
- * children
- */
+ /* Do a self check of bus type, if there's a match, create children */
if (of_match_node(matches, root)) {
rc = of_platform_bus_create(root, matches, parent);
} else for_each_child_of_node(root, child) {