From patchwork Wed Sep 30 11:46:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alper Nebi Yasak X-Patchwork-Id: 1374323 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JHRId00J; 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 4C1ZH14tPYz9sSC for ; Wed, 30 Sep 2020 21:46:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 51C2581BF9; Wed, 30 Sep 2020 13:46:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JHRId00J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B6BD81B45; Wed, 30 Sep 2020 13:46:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B7AEA81B45 for ; Wed, 30 Sep 2020 13:46:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ed1-x544.google.com with SMTP id e22so1478772edq.6 for ; Wed, 30 Sep 2020 04:46:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pm8FkPBi4KnDdN8k+OpdY813OBSMbrp03AFzevmHzJE=; b=JHRId00J+70FVC6aftmCE4GV6QhG0rSNWE5qkEcI3kFw1R0FNAMVaWJe1KO2ooYZjd mYGKnZ2he+omrjxmEBmX4OnYkl+tqoe/PzafrkeuCSm44LOVOE8uIGjHmwTLDGj9aIzv zvqA2nb23zY+NCMaDMO6Ytq+YCv/X/Ii0mYbkF+AQI9dYcuSVP/XRHnICQgINRyUiSpt vzVwLvSlXBzGiWL1mP1xBZWi7xFU/skE7jNrwlJIlSl9kOt3pu0fMQnbTxvGLLVcNU1Y 9uthWaltEpN8y/ScNiYe4J1n2jFSvgIstcv2zGZNiu6q8bSwDQYT23kkrbZHyZ9RWIe/ y7bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pm8FkPBi4KnDdN8k+OpdY813OBSMbrp03AFzevmHzJE=; b=H/2ddLBTZmmZWvIdJNY0Ss9vkXnX6xMIOtUOba9c6fnHKA3Cx9WV3n3w9E/wK5n8+o IttR3ajloSiZxeuPgKxJmia8y5huhEa3Qf3Hi41AUBT6NqZTp40i3L/Wp0GWy9pZ/lJA vVz0Dv549K7cVRwGvHBST8cNh39Ztry+8EBg0fa0ioDwAMlDXM0cu0i00uWqFyUVd8GN S05T7g1k7xNFDg9TO0uSXH7OVPv/3yirhqRtRTkKpiK+AlIcw2CPrmAH1ThZo5737P0i 8oe7xwNBqUkEDY4fd0aBr8obzhl7yp24e4KcXclv43OmXBE5n5AOUkTV8crpjcCjvJpL IWkQ== X-Gm-Message-State: AOAM533ZpUXRk1REtva69/rOoco+6cL1+bZ5iYd6ZogC7R4zkiWN39fv vhtWKCxtk0THQrOke5VosmZx17eGTOhpsg== X-Google-Smtp-Source: ABdhPJwe1rAugJ6VQTyjkeonUjLTA2oxZtljkPu8q/eJ7Ys2IuwkJwARW798YiU3O33oS6UdnOORnw== X-Received: by 2002:a50:ce06:: with SMTP id y6mr2257111edi.273.1601466391051; Wed, 30 Sep 2020 04:46:31 -0700 (PDT) Received: from localhost.localdomain ([178.233.178.9]) by smtp.gmail.com with ESMTPSA id o11sm1232729edw.80.2020.09.30.04.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 04:46:30 -0700 (PDT) From: Alper Nebi Yasak To: u-boot@lists.denx.de Cc: Simon Glass , James Byrne , Philipp Tomsich , Jagan Teki , Lukasz Majewski , Mario Six , Heinrich Schuchardt , Kever Yang , Alper Nebi Yasak Subject: [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Date: Wed, 30 Sep 2020 14:46:11 +0300 Message-Id: <20200930114612.22319-1-alpernebiyasak@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 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 CONFIG_IS_ENABLED() takes the kconfig name without the CONFIG_ prefix, e.g. CONFIG_IS_ENABLED(CLK) for CONFIG_CLK. Some of these were being fixed every now and then, see: commit 71ba2cb0d678 ("board: stm32mp1: correct CONFIG_IS_ENABLED usage for LED") commit a5ada25e4213 ("rockchip: clk: fix wrong CONFIG_IS_ENABLED handling") commit 5daf6e56d36c ("common: console: Fix duplicated CONFIG in silent env callback") commit 48bfc31b6484 ("MIPS: bootm: Fix broken boot_env_legacy codepath") Fix all files found by `git grep "CONFIG_IS_ENABLED(CONFIG"` by running ':%s/CONFIG_IS_ENABLED(CONFIG_\(\w+\))/CONFIG_IS_ENABLED(\1)/g' in vim. Signed-off-by: Alper Nebi Yasak Reviewed-by: Simon Glass --- drivers/clk/rockchip/clk_rk3399.c | 2 +- drivers/spi/nxp_fspi.c | 10 +++++----- drivers/sysreset/sysreset_mpc83xx.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c index 22c373a623..1ea41f3c5b 100644 --- a/drivers/clk/rockchip/clk_rk3399.c +++ b/drivers/clk/rockchip/clk_rk3399.c @@ -1592,7 +1592,7 @@ static int rk3399_pmuclk_ofdata_to_platdata(struct udevice *dev) static int rk3399_pmuclk_bind(struct udevice *dev) { -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP) +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP) int ret; ret = offsetof(struct rk3399_pmucru, pmucru_softrst_con[0]); diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index c507437f2e..ebd94925e9 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -520,7 +520,7 @@ static void nxp_fspi_prepare_lut(struct nxp_fspi *f, fspi_writel(f, FSPI_LCKER_LOCK, f->iobase + FSPI_LCKCR); } -#if CONFIG_IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) static int nxp_fspi_clk_prep_enable(struct nxp_fspi *f) { int ret; @@ -808,7 +808,7 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f) int ret, i; u32 reg; -#if CONFIG_IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) /* disable and unprepare clock to avoid glitch pass to controller */ nxp_fspi_clk_disable_unprep(f); @@ -898,7 +898,7 @@ static int nxp_fspi_claim_bus(struct udevice *dev) static int nxp_fspi_set_speed(struct udevice *bus, uint speed) { -#if CONFIG_IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) struct nxp_fspi *f = dev_get_priv(bus); int ret; @@ -924,7 +924,7 @@ static int nxp_fspi_set_mode(struct udevice *bus, uint mode) static int nxp_fspi_ofdata_to_platdata(struct udevice *bus) { struct nxp_fspi *f = dev_get_priv(bus); -#if CONFIG_IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) int ret; #endif @@ -950,7 +950,7 @@ static int nxp_fspi_ofdata_to_platdata(struct udevice *bus) f->ahb_addr = map_physmem(ahb_addr, ahb_size, MAP_NOCACHE); f->memmap_phy_size = ahb_size; -#if CONFIG_IS_ENABLED(CONFIG_CLK) +#if CONFIG_IS_ENABLED(CLK) ret = clk_get_by_name(bus, "fspi_en", &f->clk_en); if (ret) { dev_err(bus, "failed to get fspi_en clock\n"); diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index 456f006bc1..4e89971840 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -106,7 +106,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) if (!force && !gd->arch.arbiter_event_address) return 0; - if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL)) { + if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL)) { res = snprintf(buf, size, "Arbiter Event Status:\n" " %s: 0x%08lX\n" @@ -119,7 +119,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) "Master ID", mstr_id, master[mstr_id], "Transfer Size", tsize_val, tsize_bytes, "Transfer Type", ttype, transfer[ttype]); - } else if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { + } else if (CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { res = snprintf(buf, size, "Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n", gd->arch.arbiter_event_attributes, @@ -183,8 +183,8 @@ static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size) * TODO(mario.six@gdsys.cc): Move this into a dedicated * arbiter driver */ - if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL) || - CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { + if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) || + CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { /* * If there was a bus monitor reset event, we force the arbiter * event to be printed From patchwork Wed Sep 30 11:46:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alper Nebi Yasak X-Patchwork-Id: 1374324 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=S5qZPwGM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4C1ZH26cnxz9sSt for ; Wed, 30 Sep 2020 21:46:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2EFC822DB; Wed, 30 Sep 2020 13:46:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S5qZPwGM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F2F281BD2; Wed, 30 Sep 2020 13:46:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B46B181BD2 for ; Wed, 30 Sep 2020 13:46:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ej1-x641.google.com with SMTP id p15so2323855ejm.7 for ; Wed, 30 Sep 2020 04:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vu4EOVcNNzjF9wMUDeqhhdhajSRlVV0M19cvBCUP8GI=; b=S5qZPwGM4TdT+mMt8dWUByjj5qt5JulEgwK5eEUNP/mebHclVMmogh/8aU4qE51I3y /niVoW1DfJSPEnZ6rwtJA9/pojF3VqpPmMmBB0+K+SkLymQBFm61Vb6J4kjwq795YEKa Y8AFUma4lzOAX4z0Mvxwb7581HUdpig8CmaPd+ks0zaunKkEslbjBU4DJbUxGyVboMe6 AZGLLELuwWNqY4jl5DfsIO7e1DKxURGEVXl4uXEv2Ti7avc4XeIBw5OmnGY26N+7i3QA 07O3ktuykuUi1cBEhZSvmKZNlniGPcVvlFNvZpBe6DhL6gNkHANQCNpyiZ3toeHeLpMW oNcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vu4EOVcNNzjF9wMUDeqhhdhajSRlVV0M19cvBCUP8GI=; b=fYziSI15H1JAHFZJINJ6wJm3n+rdyOS2mWd40QyVA7IEur6zc9CIvCUsvaXI5b9c6h whV8sj5vfovENWVc8VNFiCNhOVQGSyXKZhzr+4IAXDk/T4NaTo9OGnK4uRDl66XSKocc SuTNWhRNGs0zfdZDVmlaZ1g5fZb5n8zG7zrhR3GYQmw9fj5F6MZ9br3bEmkSnMInX0Wz cFGuLWRyxY8FrU5oSk6OlwagT5Ua55gmE3gC7Wkg2Dzs230i4hdZkY7i9IbRE33rCk5G e00/6PB1XIpIkXywkNR/3pimlr8l5hdlQQhJYUxY7xgqoUQPGlKjL520AAsrwOp8YyiI H2IQ== X-Gm-Message-State: AOAM533NPJvJVdX/QlEdHyH7giPHpIELvz3pfWRFQS8RMH/7Yo7wC0OL JirtH1eAlSiVtwQ8UeBvyxj5WVgp69Hg7g== X-Google-Smtp-Source: ABdhPJyOCTo0aKStxEmulrZmwsgcTRxLUM+OQDnzxFnv3GTeB28E0N+NQ1BQDeJUwdauye59CxWrFw== X-Received: by 2002:a17:906:580a:: with SMTP id m10mr2350221ejq.200.1601466393163; Wed, 30 Sep 2020 04:46:33 -0700 (PDT) Received: from localhost.localdomain ([178.233.178.9]) by smtp.gmail.com with ESMTPSA id o11sm1232729edw.80.2020.09.30.04.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 04:46:32 -0700 (PDT) From: Alper Nebi Yasak To: u-boot@lists.denx.de Cc: Simon Glass , James Byrne , Philipp Tomsich , Jagan Teki , Lukasz Majewski , Mario Six , Heinrich Schuchardt , Kever Yang , Alper Nebi Yasak Subject: [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error Date: Wed, 30 Sep 2020 14:46:12 +0300 Message-Id: <20200930114612.22319-2-alpernebiyasak@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200930114612.22319-1-alpernebiyasak@gmail.com> References: <20200930114612.22319-1-alpernebiyasak@gmail.com> MIME-Version: 1.0 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 CONFIG_IS_ENABLED() takes the kconfig name without the CONFIG_ prefix, e.g. CONFIG_IS_ENABLED(CLK) for CONFIG_CLK. Make including the prefix an error in checkpatch.pl so calls in the wrong format aren't accidentally reintroduced. Signed-off-by: Alper Nebi Yasak --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 4bed2b0cdc..4ed7e124c9 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2365,6 +2365,12 @@ sub u_boot_line { ERROR("DISABLE_FDT_OR_INITRD_RELOC", "fdt or initrd relocation disabled at boot time\n" . $herecurr); } + + # Do not use CONFIG_ prefix in CONFIG_IS_ENABLED() calls + if ($line =~ /^\+.*CONFIG_IS_ENABLED\(CONFIG_\w*\).*/) { + ERROR("CONFIG_IS_ENABLED_CONFIG", + "CONFIG_IS_ENABLED() takes values without the CONFIG_ prefix\n" . $herecurr); + } } sub process {