From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 2/6] treewide: drop null pointer checks around of_delete_node
Date: Fri, 19 May 2023 12:01:16 +0200 [thread overview]
Message-ID: <20230519100120.2365970-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230519100120.2365970-1-a.fatoum@pengutronix.de>
of_delete_node is a no-op when called on a null pointer, so remove the
useless null checks around it.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- new patch
---
commands/of_dump.c | 3 +--
commands/of_property.c | 3 +--
common/blspec.c | 3 +--
common/state/state.c | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/commands/of_dump.c b/commands/of_dump.c
index 86755ff1e445..87a0b1ba535c 100644
--- a/commands/of_dump.c
+++ b/commands/of_dump.c
@@ -120,8 +120,7 @@ static int do_of_dump(int argc, char *argv[])
of_print_nodes(node, 0, maxpropsize);
out:
- if (of_free)
- of_delete_node(of_free);
+ of_delete_node(of_free);
return ret;
}
diff --git a/commands/of_property.c b/commands/of_property.c
index 063e97775c59..b507a3541e0a 100644
--- a/commands/of_property.c
+++ b/commands/of_property.c
@@ -401,8 +401,7 @@ static int do_of_property(int argc, char *argv[])
out:
- if (root)
- of_delete_node(root);
+ of_delete_node(root);
return ret;
}
diff --git a/common/blspec.c b/common/blspec.c
index 4b4e04b03997..e95a8dba8d76 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -473,8 +473,7 @@ static bool entry_is_of_compatible(struct blspec_entry *entry)
ret = false;
out:
- if (root)
- of_delete_node(root);
+ of_delete_node(root);
free(filename);
return ret;
diff --git a/common/state/state.c b/common/state/state.c
index 040835702b66..6b4acbb32bcc 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -559,8 +559,7 @@ static int of_state_fixup(struct device_node *root, void *ctx)
goto out;
/* delete existing node */
- if (node)
- of_delete_node(node);
+ of_delete_node(node);
return 0;
--
2.39.2
next prev parent reply other threads:[~2023-05-19 10:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-19 10:01 [PATCH v2 0/6] commands: implement of_compatible command Ahmad Fatoum
2023-05-19 10:01 ` [PATCH v2 1/6] treewide: don't mix goto labels and statements on same line Ahmad Fatoum
2023-05-19 10:01 ` Ahmad Fatoum [this message]
2023-05-19 10:01 ` [PATCH v2 3/6] commands: of_property: use new of_read_file Ahmad Fatoum
2023-05-19 10:01 ` [PATCH v2 4/6] commands: of_dump: remove duplicate error message Ahmad Fatoum
2023-05-19 10:01 ` [PATCH v2 5/6] commands: of_dump: use of_dup instead of flattening/unflattening Ahmad Fatoum
2023-05-19 10:01 ` [PATCH v2 6/6] commands: implement of_compatible command Ahmad Fatoum
2023-05-25 7:36 ` [PATCH v2 0/6] " Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230519100120.2365970-3-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox