diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:58:09 -0400 |
| commit | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (patch) | |
| tree | 65030951a26540f26dc2f6b33d4b260879b3fdd2 /arch | |
| parent | 82b2928c95d824afd9af3bb41660f3c3fa1f234e (diff) | |
of: merge of_find_all_nodes() implementations
Merge common code between Microblaze and PowerPC, and make it available
to Sparc
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 23 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index c005cc6f1aaf..b817df172aa9 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
| @@ -860,29 +860,6 @@ struct device_node *of_find_node_by_phandle(phandle handle) | |||
| 860 | EXPORT_SYMBOL(of_find_node_by_phandle); | 860 | EXPORT_SYMBOL(of_find_node_by_phandle); |
| 861 | 861 | ||
| 862 | /** | 862 | /** |
| 863 | * of_find_all_nodes - Get next node in global list | ||
| 864 | * @prev: Previous node or NULL to start iteration | ||
| 865 | * of_node_put() will be called on it | ||
| 866 | * | ||
| 867 | * Returns a node pointer with refcount incremented, use | ||
| 868 | * of_node_put() on it when done. | ||
| 869 | */ | ||
| 870 | struct device_node *of_find_all_nodes(struct device_node *prev) | ||
| 871 | { | ||
| 872 | struct device_node *np; | ||
| 873 | |||
| 874 | read_lock(&devtree_lock); | ||
| 875 | np = prev ? prev->allnext : allnodes; | ||
| 876 | for (; np != NULL; np = np->allnext) | ||
| 877 | if (of_node_get(np)) | ||
| 878 | break; | ||
| 879 | of_node_put(prev); | ||
| 880 | read_unlock(&devtree_lock); | ||
| 881 | return np; | ||
| 882 | } | ||
| 883 | EXPORT_SYMBOL(of_find_all_nodes); | ||
| 884 | |||
| 885 | /** | ||
| 886 | * of_node_get - Increment refcount of a node | 863 | * of_node_get - Increment refcount of a node |
| 887 | * @node: Node to inc refcount, NULL is supported to | 864 | * @node: Node to inc refcount, NULL is supported to |
| 888 | * simplify writing of callers | 865 | * simplify writing of callers |
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index d4405b95bfaa..4ec300862466 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -1317,29 +1317,6 @@ struct device_node *of_find_next_cache_node(struct device_node *np) | |||
| 1317 | } | 1317 | } |
| 1318 | 1318 | ||
| 1319 | /** | 1319 | /** |
| 1320 | * of_find_all_nodes - Get next node in global list | ||
| 1321 | * @prev: Previous node or NULL to start iteration | ||
| 1322 | * of_node_put() will be called on it | ||
| 1323 | * | ||
| 1324 | * Returns a node pointer with refcount incremented, use | ||
| 1325 | * of_node_put() on it when done. | ||
| 1326 | */ | ||
| 1327 | struct device_node *of_find_all_nodes(struct device_node *prev) | ||
| 1328 | { | ||
| 1329 | struct device_node *np; | ||
| 1330 | |||
| 1331 | read_lock(&devtree_lock); | ||
| 1332 | np = prev ? prev->allnext : allnodes; | ||
| 1333 | for (; np != 0; np = np->allnext) | ||
| 1334 | if (of_node_get(np)) | ||
| 1335 | break; | ||
| 1336 | of_node_put(prev); | ||
| 1337 | read_unlock(&devtree_lock); | ||
| 1338 | return np; | ||
| 1339 | } | ||
| 1340 | EXPORT_SYMBOL(of_find_all_nodes); | ||
| 1341 | |||
| 1342 | /** | ||
| 1343 | * of_node_get - Increment refcount of a node | 1320 | * of_node_get - Increment refcount of a node |
| 1344 | * @node: Node to inc refcount, NULL is supported to | 1321 | * @node: Node to inc refcount, NULL is supported to |
| 1345 | * simplify writing of callers | 1322 | * simplify writing of callers |
