59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From ebf1ac6c0ead3d6fbc32466028c286588333c1ea Mon Sep 17 00:00:00 2001
|
|
From: Yanan Wang <wangyanan55@huawei.com>
|
|
Date: Tue, 11 Jan 2022 11:27:58 +0800
|
|
Subject: [PATCH 22/24] softmmu/device_tree: Remove redundant pointer
|
|
assignment
|
|
|
|
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: Andrew Jones <drjones@redhat.com>
|
|
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Message-id: 20220111032758.27804-1-wangyanan55@huawei.com
|
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.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
|
|
|