The device_node pointer in struct of_phandle_args is called "np", not
"node".
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 2305dc0382bca0a5..e3f9043860c81b5d 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1560,7 +1560,7 @@ EXPORT_SYMBOL(of_parse_phandle);
* Returns 0 on success and fills out_args, on error returns appropriate
* errno value.
*
- * Caller is responsible to call of_node_put() on the returned out_args->node
+ * Caller is responsible to call of_node_put() on the returned out_args->np
* pointer.
*
* Example:
@@ -1603,7 +1603,7 @@ EXPORT_SYMBOL(of_parse_phandle_with_args);
* Returns 0 on success and fills out_args, on error returns appropriate
* errno value.
*
- * Caller is responsible to call of_node_put() on the returned out_args->node
+ * Caller is responsible to call of_node_put() on the returned out_args->np
* pointer.
*
* Example:
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 48d6673fa9a28bf0..cff3afcff1951faf 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -923,7 +923,7 @@ const struct of_device_id *__of_match_node(const struct of_device_id *matches,
}
/**
- * of_match_node - Tell if an device_node has a matching of_match structure
+ * of_match_node - Tell if a device_node has a matching of_match structure
* @matches: array of of device match structures to search in
* @node: the of device structure to match against
*
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/base.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index cff3afcff1951faf..19075e770d8b6306 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -577,9 +577,9 @@ EXPORT_SYMBOL(of_get_parent);
* of_get_next_parent - Iterate to a node's parent
* @node: Node to get parent of
*
- * This is like of_get_parent() except that it drops the
- * refcount on the passed node, making it suitable for iterating
- * through a node's parents.
+ * This is like of_get_parent() except that it drops the
+ * refcount on the passed node, making it suitable for iterating
+ * through a node's parents.
*
* Returns a node pointer with refcount incremented, use
* of_node_put() on it when done.
@@ -1566,15 +1566,15 @@ EXPORT_SYMBOL(of_parse_phandle);
* Example:
*
* phandle1: node1 {
- * #list-cells = <2>;
+ * #list-cells = <2>;
* }
*
* phandle2: node2 {
- * #list-cells = <1>;
+ * #list-cells = <1>;
* }
*
* node3 {
- * list = <&phandle1 1 2 &phandle2 3>;
+ * list = <&phandle1 1 2 &phandle2 3>;
* }
*
* To get a device_node of the `node2' node you may call this:
@@ -1615,7 +1615,7 @@ EXPORT_SYMBOL(of_parse_phandle_with_args);
* }
*
* node3 {
- * list = <&phandle1 0 2 &phandle2 2 3>;
+ * list = <&phandle1 0 2 &phandle2 2 3>;
* }
*
* To get a device_node of the `node2' node you may call this:
--
1.9.1
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/of/base.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index e3f9043860c81b5d..48d6673fa9a28bf0 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1849,14 +1849,14 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np,
}
/**
- * of_alias_scan - Scan all properties of 'aliases' node
+ * of_alias_scan - Scan all properties of the 'aliases' node
*
- * The function scans all the properties of 'aliases' node and populate
- * the the global lookup table with the properties. It returns the
- * number of alias_prop found, or error code in error case.
+ * The function scans all the properties of the 'aliases' node and populates
+ * the global lookup table with the properties. It returns the
+ * number of alias properties found, or an error code in case of failure.
*
* @dt_alloc: An allocator that provides a virtual address to memory
- * for the resulting tree
+ * for storing the resulting tree
*/
void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
{
--
1.9.1
On Wed, 22 Oct 2014 11:44:55 +0200
, Geert Uytterhoeven <[email protected]>
wrote:
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Applied all 4 patches. Thanks.
g.
> ---
> drivers/of/base.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index cff3afcff1951faf..19075e770d8b6306 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -577,9 +577,9 @@ EXPORT_SYMBOL(of_get_parent);
> * of_get_next_parent - Iterate to a node's parent
> * @node: Node to get parent of
> *
> - * This is like of_get_parent() except that it drops the
> - * refcount on the passed node, making it suitable for iterating
> - * through a node's parents.
> + * This is like of_get_parent() except that it drops the
> + * refcount on the passed node, making it suitable for iterating
> + * through a node's parents.
> *
> * Returns a node pointer with refcount incremented, use
> * of_node_put() on it when done.
> @@ -1566,15 +1566,15 @@ EXPORT_SYMBOL(of_parse_phandle);
> * Example:
> *
> * phandle1: node1 {
> - * #list-cells = <2>;
> + * #list-cells = <2>;
> * }
> *
> * phandle2: node2 {
> - * #list-cells = <1>;
> + * #list-cells = <1>;
> * }
> *
> * node3 {
> - * list = <&phandle1 1 2 &phandle2 3>;
> + * list = <&phandle1 1 2 &phandle2 3>;
> * }
> *
> * To get a device_node of the `node2' node you may call this:
> @@ -1615,7 +1615,7 @@ EXPORT_SYMBOL(of_parse_phandle_with_args);
> * }
> *
> * node3 {
> - * list = <&phandle1 0 2 &phandle2 2 3>;
> + * list = <&phandle1 0 2 &phandle2 2 3>;
> * }
> *
> * To get a device_node of the `node2' node you may call this:
> --
> 1.9.1
>