From: Marco Felsch <m.felsch@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
BAREBOX <barebox@lists.infradead.org>
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: [PATCH v4 05/11] of: overlay: refactor of_overlay_global_fixup
Date: Tue, 29 Jul 2025 17:34:30 +0200 [thread overview]
Message-ID: <20250729-v2024-05-0-topic-fit-overlay-v4-5-af3ad99acde2@pengutronix.de> (raw)
In-Reply-To: <20250729-v2024-05-0-topic-fit-overlay-v4-0-af3ad99acde2@pengutronix.de>
Prepare of_overlay_global_fixup() for upcoming FIT image based overlays
support.
Check if the of_overlay_path is empty and return early. Make use of
isempty() helper while on it.
Simplify the code flow by setting up the dir variable accordingly before
calling of_overlay_apply_dir() to drop special '/' path
of_overlay_apply_dir() call.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
drivers/of/overlay.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index bc3fdff0cd277b3460981769c2b220adfced6e80..f02a12d44f0d53db3fb7bb065461c0ef193d0ab3 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -468,13 +468,13 @@ static int of_overlay_global_fixup(struct device_node *root, void *data)
char *dir;
int ret;
- if (*of_overlay_path == '/')
- return of_overlay_apply_dir(root, of_overlay_path, true);
-
- if (*of_overlay_path == '\0')
+ if (isempty(of_overlay_path))
return 0;
- dir = concat_path_file(of_overlay_basedir, of_overlay_path);
+ if (*of_overlay_path == '/')
+ dir = xstrdup(of_overlay_path);
+ else
+ dir = concat_path_file(of_overlay_basedir, of_overlay_path);
ret = of_overlay_apply_dir(root, dir, true);
--
2.39.5
next prev parent reply other threads:[~2025-07-29 15:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 15:34 [PATCH v4 00/11] Add FIT image overlay support Marco Felsch
2025-07-29 15:34 ` [PATCH v4 01/11] FIT: fix missing free in fit_open error path Marco Felsch
2025-07-29 15:34 ` [PATCH v4 02/11] FIT: fit_open_configuration: add match function support Marco Felsch
2025-07-29 15:34 ` [PATCH v4 03/11] of: overlay: make the pattern match function more generic Marco Felsch
2025-07-29 15:34 ` [PATCH v4 04/11] of: overlay: make search dir " Marco Felsch
2025-07-29 15:34 ` Marco Felsch [this message]
2025-07-29 15:34 ` [PATCH v4 06/11] FIT: make fit_config_verify_signature public Marco Felsch
2025-07-29 15:34 ` [PATCH v4 07/11] of: overlay: add FIT image overlay support Marco Felsch
2025-08-05 10:57 ` Sascha Hauer
2025-08-05 20:14 ` Marco Felsch
2025-07-29 15:34 ` [PATCH v4 08/11] of: overlay: replace filename with an more unique name Marco Felsch
2025-07-29 15:34 ` [PATCH v4 09/11] FIT: fit_open: make filename handling more robust Marco Felsch
2025-07-29 15:34 ` [PATCH v4 10/11] FIT: fit_open: save the filename Marco Felsch
2025-07-29 15:34 ` [PATCH v4 11/11] FIT: add support to cache opened fit images Marco Felsch
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=20250729-v2024-05-0-topic-fit-overlay-v4-5-af3ad99acde2@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/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