diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-08-14 15:27:09 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-08-29 21:40:22 +0100 |
commit | 5fba49e3a8c22a7bb71c3526ec32b373b3ef32b8 (patch) | |
tree | c90f0e7c77115a0cc30629836ba1fe2cf9ff4522 /drivers/of | |
parent | eded9dd40b1e30215ab7379dc433f3d3c662ec88 (diff) | |
download | op-kernel-dev-5fba49e3a8c22a7bb71c3526ec32b373b3ef32b8.zip op-kernel-dev-5fba49e3a8c22a7bb71c3526ec32b373b3ef32b8.tar.gz |
of: move of_parse_phandle()
Move of_parse_phandle() after __of_parse_phandle_with_args(), since a
future patch will call __of_parse_phandle_with_args() from
of_parse_phandle(). Moving the function avoids adding a prototype. Doing
the move separately highlights the code changes separately.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/base.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index ab32561..ef2f1d0 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1080,30 +1080,6 @@ int of_property_count_strings(struct device_node *np, const char *propname) } EXPORT_SYMBOL_GPL(of_property_count_strings); -/** - * of_parse_phandle - Resolve a phandle property to a device_node pointer - * @np: Pointer to device node holding phandle property - * @phandle_name: Name of property holding a phandle value - * @index: For properties holding a table of phandles, this is the index into - * the table - * - * Returns the device_node pointer with refcount incremented. Use - * of_node_put() on it when done. - */ -struct device_node *of_parse_phandle(const struct device_node *np, - const char *phandle_name, int index) -{ - const __be32 *phandle; - int size; - - phandle = of_get_property(np, phandle_name, &size); - if ((!phandle) || (size < sizeof(*phandle) * (index + 1))) - return NULL; - - return of_find_node_by_phandle(be32_to_cpup(phandle + index)); -} -EXPORT_SYMBOL(of_parse_phandle); - static int __of_parse_phandle_with_args(const struct device_node *np, const char *list_name, const char *cells_name, int index, @@ -1207,6 +1183,30 @@ static int __of_parse_phandle_with_args(const struct device_node *np, } /** + * of_parse_phandle - Resolve a phandle property to a device_node pointer + * @np: Pointer to device node holding phandle property + * @phandle_name: Name of property holding a phandle value + * @index: For properties holding a table of phandles, this is the index into + * the table + * + * Returns the device_node pointer with refcount incremented. Use + * of_node_put() on it when done. + */ +struct device_node *of_parse_phandle(const struct device_node *np, + const char *phandle_name, int index) +{ + const __be32 *phandle; + int size; + + phandle = of_get_property(np, phandle_name, &size); + if ((!phandle) || (size < sizeof(*phandle) * (index + 1))) + return NULL; + + return of_find_node_by_phandle(be32_to_cpup(phandle + index)); +} +EXPORT_SYMBOL(of_parse_phandle); + +/** * of_parse_phandle_with_args() - Find a node pointed by phandle in a list * @np: pointer to a device tree node containing a list * @list_name: property name that contains a list |