From patchwork Tue Nov 10 20:25:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1397795 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=Fp8AzBKv; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CVzsw27D0z9s0b for ; Wed, 11 Nov 2020 07:26:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21746822D2; Tue, 10 Nov 2020 21:26:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="Fp8AzBKv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2FB04821A4; Tue, 10 Nov 2020 21:26:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0726.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::726]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 799CC821A4 for ; Tue, 10 Nov 2020 21:26:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CP0Vp3175fXA0JJm095HfM9MHPUGQmmD6nHzbHoAdAZm7Y+fTOW9d2h8t+sypydVdtd0oRW0qo06o+C4DhmGLfBUornjXJa8WR2LmpniFJcNQ9hZK+eY41ivlf1bJnZOqjGbKP0RyhY1VzvSTu6g8UEm3NpzPwGLCUyvpqoXP3Y+VBDHogkj2yuNju34heGwlX/ScEkGAcq2GZf7i0V682EGBaoQsGfiYKDZkYI9MNA7EaBnNZ8n0ti3J7XV97a2ijeH20XghiC+H4Xc3v5vWnA4xO7PsPTKZ/NdcwfUSVEzpd9JRRuUCTiMuKHviixue3OHAAZFqR5HnwFR5sh9OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3ouxog9gj9q/ZPcLVQRAPSHqBcr16Dge2Td47jeTrtQ=; b=H5o3RVzYzwwRQDiTrOMCpXlHyp+QTN4JK+nUUPsEF8iGaiNlbstKvdC9REy25Ol9Dl2nyyEyuiKVz/ZuzkXm6cMXJt/YUwsWpsnW2dbC4rUqE+U1is+Y4XqwaFC4w/8h3gL9xQc0Nd+uIW9LtTMTuevk3Cyub/GiLMh4pGZTgjQjtUffRvrldulw2zZrrXpfDtHsxvwvK3Lj2L7jImD7J1GoVzoUXJeUEJKJQ5uAk6fGFM6MOkDyNkyEcQlHkPfu7pU2PbXGC/UIVy7RiJTJOzXND2cFm+M2InzkvXHoo6fWje4AjXx16oFKXPqywxMQ7DrZAbfVvHWDdlfHpgcQag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3ouxog9gj9q/ZPcLVQRAPSHqBcr16Dge2Td47jeTrtQ=; b=Fp8AzBKven4QwE/DtOk97X8IRCI2e4zz8GphhxPgIdz8/g7D5bKprn5yv9bpowljDI9qbvHDpnlwz8EDfKOHhSIhrvIN/NXp4a6v2SP7ocUFn++Az4V87ALQSRYnGom/xIgVWT095p9/HOyBu7U1lmjrGxPAK7mOwfPx24ByRDQ= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) by AM0PR10MB3299.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:188::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.30; Tue, 10 Nov 2020 20:26:12 +0000 Received: from AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::9dc3:9785:dc4e:ad62]) by AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM ([fe80::9dc3:9785:dc4e:ad62%6]) with mapi id 15.20.3499.032; Tue, 10 Nov 2020 20:26:12 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Simon Glass , Joe Hershberger , Wolfgang Denk , Patrick Delaunay , Tom Rini , Rasmus Villemoes Subject: [PATCH 1/5] fdtdec: make fdtdec_get_config_string() return const char* Date: Tue, 10 Nov 2020 21:25:59 +0100 Message-Id: <20201110202603.20944-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20201110202603.20944-1-rasmus.villemoes@prevas.dk> References: <20201110202603.20944-1-rasmus.villemoes@prevas.dk> X-Originating-IP: [5.186.115.188] X-ClientProxiedBy: AM6PR0202CA0067.eurprd02.prod.outlook.com (2603:10a6:20b:3a::44) To AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:3f::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.115.188) by AM6PR0202CA0067.eurprd02.prod.outlook.com (2603:10a6:20b:3a::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Tue, 10 Nov 2020 20:26:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de5fe909-743b-4e30-998a-08d885b6dd8a X-MS-TrafficTypeDiagnostic: AM0PR10MB3299: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A0olaplwVQHgDjvefFS17PjQ7lS2pQ2l5JqQ0cHrka3baMtpktBOGroLHpKL8N8LIocVCMk1NbUI9SCCTHwF6my87LWkWB4dC9kUrNsNDJeygZ2f+fpnshO8bj8MO/cF2+WT4cazVi/z6BLVSZ5SV5w0KYPy4lO3vZwXYpe+hmRz3qqTNUic4rm4iSLlMGxFfcdgxGQgp/wl12qw60epXkRiRdIPLGIQh59R6ZL4YHRU34Ham5PlYupsNaBeOjA7RU9z3mfnNg5Y23uZWLjPXd2ivvv6GOyzCVrX8jEv30LL66l9col+qEADahsbbywvQWIxoEv7fE+UUPGtvyXawA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(396003)(39830400003)(136003)(376002)(366004)(346002)(6486002)(5660300002)(52116002)(2906002)(316002)(107886003)(8936002)(6506007)(8676002)(66556008)(66476007)(66946007)(83380400001)(956004)(86362001)(8976002)(6916009)(44832011)(478600001)(16526019)(6512007)(186003)(54906003)(4326008)(1076003)(6666004)(36756003)(2616005)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: mgX5soEPRTcMhZWPAmZwsb5JxVSJRQOxMVoFBpW+VkX2Ka1Yq2NY6rmOVH3hskvn/tdbMtQY7wu9lhx4EFHhFsW99ht2v7wxIpNp1bwjftyzdNSilDT+LHPEv//jaVEhSLY42+8CpMzTU7nsb394Xrs4QwFThL6J3I2h3ULuPaxFcFswbKsIbchaTBD1G6Mwps7UBqmaC7jQqeGiOdPIFR/81kyhSIMw7CQRK/9OV0+V7+JqdbBmascTag45cuUtixla6SA0H+PxxJtg8VZ5cOcnIqpNAY+yeso4Hv8/hQ+/soNgxneChrOwqvYgHmxByF9msqbT71+u3gB77I/ZXaU+IQKUZ3nKLw4ihX2980cfE3fi7vpd3pb00CT/KZKhW1oq5TaEISgGF+1GEn+CQih7srlG+/Fsp4+0uVi70AFe7cHv7Iww5vAm0+HpcIE449Oje1IfZByrBMkxAE/4saIhVANV0F7qHK6myIDbh2ILbXqqA8jtcsFmfjCO0H8FfNy8RvBS9nc0tR5KgI9p8mICaWE6HV+nYRKQXimuqxHV45lS6Vpqw2c82cyt7vxowXgSgRCwSe9Cb+3wvKe12i/cJMvTau/M+fa4/VF8D/XjlEKqKCiS4Erz2tU/6YuJPIgaXbbZdpVXf2qAmEl3SQ== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: de5fe909-743b-4e30-998a-08d885b6dd8a X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2020 20:26:12.2314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: puTYBEUf8ChEZQnFin4sAdwQ8jbFYdFbRa5LW12fa9pYph86pCvUNyRakjfTfv9MhiI8CDB05vm30THxn4TiD2qc1LqHBZrGSffwXaf1kV4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3299 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Nobody should modify the string returned by fdtdec_get_config_string(), so make it return a const pointer. Signed-off-by: Rasmus Villemoes Reviewed-by: Simon Glass --- arch/arm/mach-exynos/include/mach/mipi_dsim.h | 2 +- arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- board/dhelectronics/dh_stm32mp1/board.c | 2 +- board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- common/cli.c | 2 +- include/fdtdec.h | 2 +- lib/fdtdec.c | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h index 20e6ce7f72..1cdea29b78 100644 --- a/arch/arm/mach-exynos/include/mach/mipi_dsim.h +++ b/arch/arm/mach-exynos/include/mach/mipi_dsim.h @@ -313,7 +313,7 @@ struct mipi_dsim_master_ops { * @platform_data: lcd panel specific platform data. */ struct mipi_dsim_lcd_device { - char *name; + const char *name; int id; int bus_id; int reverse_panel; diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index 222953ab94..1f0adac62a 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -111,7 +111,7 @@ static int setup_led(void) { #ifdef CONFIG_SPL_LED struct udevice *dev; - char *led_name; + const char *led_name; int ret; led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led"); diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index f42d395098..c59bf26223 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -372,7 +372,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) #ifdef CONFIG_LED static int get_led(struct udevice **dev, char *led_string) { - char *led_name; + const char *led_name; int ret; led_name = fdtdec_get_config_string(gd->fdt_blob, led_string); diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c index bd8a32cf7b..a2bef1c928 100644 --- a/board/firefly/firefly-rk3288/firefly-rk3288.c +++ b/board/firefly/firefly-rk3288/firefly-rk3288.c @@ -14,7 +14,7 @@ static int setup_led(void) { #ifdef CONFIG_SPL_LED struct udevice *dev; - char *led_name; + const char *led_name; int ret; led_name = fdtdec_get_config_string(gd->fdt_blob, "u-boot,boot-led"); diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 03a19af930..82798773f5 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -226,7 +226,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) static int get_led(struct udevice **dev, char *led_string) { - char *led_name; + const char *led_name; int ret; led_name = fdtdec_get_config_string(gd->fdt_blob, led_string); diff --git a/common/cli.c b/common/cli.c index 6635ab2bcf..f0e8f2880c 100644 --- a/common/cli.c +++ b/common/cli.c @@ -156,7 +156,7 @@ int do_run(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bool cli_process_fdt(const char **cmdp) { /* Allow the fdt to override the boot command */ - char *env = fdtdec_get_config_string(gd->fdt_blob, "bootcmd"); + const char *env = fdtdec_get_config_string(gd->fdt_blob, "bootcmd"); if (env) *cmdp = env; /* diff --git a/include/fdtdec.h b/include/fdtdec.h index 62d1660973..a037f6ed9c 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -778,7 +778,7 @@ int fdtdec_get_config_bool(const void *blob, const char *prop_name); * @param prop_name property name to look up * @returns property string, NULL on error. */ -char *fdtdec_get_config_string(const void *blob, const char *prop_name); +const char *fdtdec_get_config_string(const void *blob, const char *prop_name); /* * Look up a property in a node and return its contents in a byte diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ee1bd41b08..25a71bc8f9 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -879,7 +879,7 @@ int fdtdec_get_config_bool(const void *blob, const char *prop_name) return prop != NULL; } -char *fdtdec_get_config_string(const void *blob, const char *prop_name) +const char *fdtdec_get_config_string(const void *blob, const char *prop_name) { const char *nodep; int nodeoffset; @@ -894,7 +894,7 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name) if (!nodep) return NULL; - return (char *)nodep; + return nodep; } u64 fdtdec_get_number(const fdt32_t *ptr, unsigned int cells)