From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jul 2025 17:35:10 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1ugmMA-004y2F-1e for lore@lore.pengutronix.de; Tue, 29 Jul 2025 17:35:10 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ugmM8-0008RZ-B2 for lore@pengutronix.de; Tue, 29 Jul 2025 17:35:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nSVDdQXdMMoJSP0OfrKxSgahbMAOGw+4aVZrGgDRTXU=; b=rdc6U9EgUaHzSrsZdbUBTYtT2p 3E1qL3+4AXUMVtiwPZKQDMC3yGAZITdR31Vh435inNW86yIIEh29i280246ODpiHSMcort1izZszS Uodk0zjkDPEeSXVI6SMTOkKarsGYqcYbcKZKs5TGtP3LdyFO4Wp+cn1DUbSyIr2ToGlX9KIfaW1Se hHnnClC2gm/QmM2/8+1t5bijH7uLDHLVD97w7ML4JAi9S5gFNSU9KADFgpBICeTNZ8aGiobCurXLQ knjcnxAYG8ex7URWllVyGMmntrrwiNsN9uqZI0GIYdjt4WTG8GuetXffO5s/iwCU5YxRxWS0aRvw5 9eRv1dsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugmLd-0000000H92k-0KWR; Tue, 29 Jul 2025 15:34:37 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugmLW-0000000H8vr-0zrP for barebox@lists.infradead.org; Tue, 29 Jul 2025 15:34:33 +0000 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ugmLT-0007q6-MA; Tue, 29 Jul 2025 17:34:27 +0200 From: Marco Felsch Date: Tue, 29 Jul 2025 17:34:30 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250729-v2024-05-0-topic-fit-overlay-v4-5-af3ad99acde2@pengutronix.de> References: <20250729-v2024-05-0-topic-fit-overlay-v4-0-af3ad99acde2@pengutronix.de> In-Reply-To: <20250729-v2024-05-0-topic-fit-overlay-v4-0-af3ad99acde2@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Marco Felsch X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250729_083430_339474_9FEAD217 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 05/11] of: overlay: refactor of_overlay_global_fixup X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.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 --- 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