1. Patchew
  2. QEMU
  3. View series

[PATCH] softmmu/device_tree: Remove redundant pointer assignment

Yanan Wang via posted 1 patch 4 years ago
Failed in applying to current master (apply log)
softmmu/device_tree.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
[PATCH] softmmu/device_tree: Remove redundant pointer assignment
Posted by Yanan Wang via 4 years ago 
The pointer assignment "const char *p = path;" in function
qemu_fdt_add_path is unnecessary. Let's remove it and just
use the "path" passed in. No functional change.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
---
Based on: softmmu/device_tree: Silence compiler warning with --enable-sanitizers
https://patchew.org/QEMU/20220107133844.145039-1-thuth@redhat.com/
---
 softmmu/device_tree.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 9e96f5ecd5..8897c79ea4 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -556,7 +556,6 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
 int qemu_fdt_add_path(void *fdt, const char *path)
 {
     const char *name;
-    const char *p = path;
     int namelen, retval;
     int parent = 0;
 
@@ -565,9 +564,9 @@ int qemu_fdt_add_path(void *fdt, const char *path)
     }
 
     do {
-        name = p + 1;
-        p = strchr(name, '/');
-        namelen = p != NULL ? p - name : strlen(name);
+        name = path + 1;
+        path = strchr(name, '/');
+        namelen = path != NULL ? path - name : strlen(name);
 
         retval = fdt_subnode_offset_namelen(fdt, parent, name, namelen);
         if (retval < 0 && retval != -FDT_ERR_NOTFOUND) {
@@ -584,7 +583,7 @@ int qemu_fdt_add_path(void *fdt, const char *path)
         }
 
         parent = retval;
-    } while (p);
+    } while (path);
 
     return retval;
 }
-- 
2.27.0
Re: [PATCH] softmmu/device_tree: Remove redundant pointer assignment
Posted by Andrew Jones 4 years ago 
On Tue, Jan 11, 2022 at 11:27:58AM +0800, Yanan Wang wrote:
> The pointer assignment "const char *p = path;" in function
> qemu_fdt_add_path is unnecessary. Let's remove it and just
> use the "path" passed in. No functional change.
> 
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
> Based on: softmmu/device_tree: Silence compiler warning with --enable-sanitizers
> https://patchew.org/QEMU/20220107133844.145039-1-thuth@redhat.com/
> ---
>  softmmu/device_tree.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
> index 9e96f5ecd5..8897c79ea4 100644
> --- a/softmmu/device_tree.c
> +++ b/softmmu/device_tree.c
> @@ -556,7 +556,6 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
>  int qemu_fdt_add_path(void *fdt, const char *path)
>  {
>      const char *name;
> -    const char *p = path;
>      int namelen, retval;
>      int parent = 0;
>  
> @@ -565,9 +564,9 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>      }
>  
>      do {
> -        name = p + 1;
> -        p = strchr(name, '/');
> -        namelen = p != NULL ? p - name : strlen(name);
> +        name = path + 1;
> +        path = strchr(name, '/');
> +        namelen = path != NULL ? path - name : strlen(name);
>  
>          retval = fdt_subnode_offset_namelen(fdt, parent, name, namelen);
>          if (retval < 0 && retval != -FDT_ERR_NOTFOUND) {
> @@ -584,7 +583,7 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>          }
>  
>          parent = retval;
> -    } while (p);
> +    } while (path);
>  
>      return retval;
>  }
> -- 
> 2.27.0
>

 
Reviewed-by: Andrew Jones <drjones@redhat.com>
Re: [PATCH] softmmu/device_tree: Remove redundant pointer assignment
Posted by Alistair Francis 4 years ago 
On Tue, Jan 11, 2022 at 1:28 PM Yanan Wang via <qemu-devel@nongnu.org> wrote:
>
> The pointer assignment "const char *p = path;" in function
> qemu_fdt_add_path is unnecessary. Let's remove it and just
> use the "path" passed in. No functional change.
>
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
> Based on: softmmu/device_tree: Silence compiler warning with --enable-sanitizers
> https://patchew.org/QEMU/20220107133844.145039-1-thuth@redhat.com/
> ---
>  softmmu/device_tree.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
> index 9e96f5ecd5..8897c79ea4 100644
> --- a/softmmu/device_tree.c
> +++ b/softmmu/device_tree.c
> @@ -556,7 +556,6 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
>  int qemu_fdt_add_path(void *fdt, const char *path)
>  {
>      const char *name;
> -    const char *p = path;
>      int namelen, retval;
>      int parent = 0;
>
> @@ -565,9 +564,9 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>      }
>
>      do {
> -        name = p + 1;
> -        p = strchr(name, '/');
> -        namelen = p != NULL ? p - name : strlen(name);
> +        name = path + 1;
> +        path = strchr(name, '/');
> +        namelen = path != NULL ? path - name : strlen(name);
>
>          retval = fdt_subnode_offset_namelen(fdt, parent, name, namelen);
>          if (retval < 0 && retval != -FDT_ERR_NOTFOUND) {
> @@ -584,7 +583,7 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>          }
>
>          parent = retval;
> -    } while (p);
> +    } while (path);
>
>      return retval;
>  }
> --
> 2.27.0
>
>
Re: [PATCH] softmmu/device_tree: Remove redundant pointer assignment
Posted by Thomas Huth 4 years ago 
On 11/01/2022 04.27, Yanan Wang wrote:
> The pointer assignment "const char *p = path;" in function
> qemu_fdt_add_path is unnecessary. Let's remove it and just
> use the "path" passed in. No functional change.
> 
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
> Based on: softmmu/device_tree: Silence compiler warning with --enable-sanitizers
> https://patchew.org/QEMU/20220107133844.145039-1-thuth@redhat.com/
> ---
>   softmmu/device_tree.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH] softmmu/device_tree: Remove redundant pointer assignment
Posted by Alistair Francis 4 years ago 
On Tue, Jan 11, 2022 at 1:28 PM Yanan Wang via <qemu-devel@nongnu.org> wrote:
>
> The pointer assignment "const char *p = path;" in function
> qemu_fdt_add_path is unnecessary. Let's remove it and just
> use the "path" passed in. No functional change.
>
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>

Thanks!

Applied to riscv-to-apply.next

Alistair

> ---
> Based on: softmmu/device_tree: Silence compiler warning with --enable-sanitizers
> https://patchew.org/QEMU/20220107133844.145039-1-thuth@redhat.com/
> ---
>  softmmu/device_tree.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
> index 9e96f5ecd5..8897c79ea4 100644
> --- a/softmmu/device_tree.c
> +++ b/softmmu/device_tree.c
> @@ -556,7 +556,6 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
>  int qemu_fdt_add_path(void *fdt, const char *path)
>  {
>      const char *name;
> -    const char *p = path;
>      int namelen, retval;
>      int parent = 0;
>
> @@ -565,9 +564,9 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>      }
>
>      do {
> -        name = p + 1;
> -        p = strchr(name, '/');
> -        namelen = p != NULL ? p - name : strlen(name);
> +        name = path + 1;
> +        path = strchr(name, '/');
> +        namelen = path != NULL ? path - name : strlen(name);
>
>          retval = fdt_subnode_offset_namelen(fdt, parent, name, namelen);
>          if (retval < 0 && retval != -FDT_ERR_NOTFOUND) {
> @@ -584,7 +583,7 @@ int qemu_fdt_add_path(void *fdt, const char *path)
>          }
>
>          parent = retval;
> -    } while (p);
> +    } while (path);
>
>      return retval;
>  }
> --
> 2.27.0
>
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.