summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorJonas Bonn <jonas@southpole.se>2010-07-23 20:19:24 +0200
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 09:58:22 -0600
commitc0dd394ca5e78649b7013c3ce2d6338af9f228f0 (patch)
treeed1702f29368675d22fd31a7b00497674011e179 /drivers/of
parentc608558407aa64d2b98d58bfc116e95c0afb357e (diff)
of: remove of_default_bus_ids
This list used was by only two platforms with all other platforms defining an own list of valid bus id's to pass to of_platform_bus_probe. This patch: i) copies the default list to the two platforms that depended on it (powerpc) ii) remove the usage of of_default_bus_ids in of_platform_bus_probe iii) removes the definition of the list from all architectures that defined it Passing a NULL 'matches' parameter to of_platform_bus_probe is still valid; the function returns no error in that case as the NULL value is equivalent to an empty list. Signed-off-by: Jonas Bonn <jonas@southpole.se> [grant.likely@secretlab.ca: added __initdata annotations, warn on and return error on missing match table, and fix whitespace errors] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/platform.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f79f40b516c6..033a224a9fda 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -701,9 +701,7 @@ int of_platform_bus_probe(struct device_node *root,
struct platform_device *dev;
int rc = 0;
- if (matches == NULL)
- matches = of_default_bus_ids;
- if (matches == OF_NO_DEEP_PROBE)
+ if (WARN_ON(!matches || matches == OF_NO_DEEP_PROBE))
return -EINVAL;
if (root == NULL)
root = of_find_node_by_path("/");