[PATCH -next] of/fdt: declared return type does not match actual return type

Xu Qiang posted 1 patch 3 years, 8 months ago
There is a newer version of this series
drivers/of/fdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH -next] of/fdt: declared return type does not match actual return type
Posted by Xu Qiang 3 years, 8 months ago
The commit 649cab56de8e (“of: properly check for error returned
by fdt_get_name()”) changed the return value type from bool to int,
but forgot to change the return value simultaneously.

populate_node was only called in unflatten_dt_nodes, and returns
with values greater than or equal to 0 were discarded without further
processing. Considering that return 0 usually indicates success,
return 0 instead of return true.

Fixes: 649cab56de8e (“of: properly check for error returned by fdt_get_name()”)
Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
---
 drivers/of/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 22b3d35a5e76..4fe448d8d2ae 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -246,7 +246,7 @@ static int populate_node(const void *blob,
 	}
 
 	*pnp = np;
-	return true;
+	return 0;
 }
 
 static void reverse_nodes(struct device_node *parent)
-- 
2.17.1

[PATCH -next] of/fdt: declared return type does not match actual return type
Posted by Xu Qiang 3 years, 8 months ago
The commit 649cab56de8e (“of: properly check for error returned
by fdt_get_name()”) changed the return value type from bool to int,
but forgot to change the return value simultaneously.

populate_node was only called in unflatten_dt_nodes, and returns
with values greater than or equal to 0 were discarded without further
processing. Considering that return 0 usually indicates success,
return 0 instead of return true.

Fixes: 649cab56de8e (“of: properly check for error returned by fdt_get_name()”)
Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
---
 drivers/of/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 22b3d35a5e76..4fe448d8d2ae 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -246,7 +246,7 @@ static int populate_node(const void *blob,
 	}
 
 	*pnp = np;
-	return true;
+	return 0;
 }
 
 static void reverse_nodes(struct device_node *parent)
-- 
2.17.1

Re: [PATCH -next] of/fdt: declared return type does not match actual return type
Posted by Rob Herring 3 years, 8 months ago
On Mon, 01 Aug 2022 12:05:06 +0000, Xu Qiang wrote:
> The commit 649cab56de8e (“of: properly check for error returned
> by fdt_get_name()”) changed the return value type from bool to int,
> but forgot to change the return value simultaneously.
> 
> populate_node was only called in unflatten_dt_nodes, and returns
> with values greater than or equal to 0 were discarded without further
> processing. Considering that return 0 usually indicates success,
> return 0 instead of return true.
> 
> Fixes: 649cab56de8e (“of: properly check for error returned by fdt_get_name()”)
> Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
> ---
>  drivers/of/fdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied, thanks!