All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling
@ 2020-09-30 11:46 Alper Nebi Yasak
  2020-09-30 11:46 ` [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error Alper Nebi Yasak
  2020-10-05  1:52 ` [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Simon Glass
  0 siblings, 2 replies; 4+ messages in thread
From: Alper Nebi Yasak @ 2020-09-30 11:46 UTC (permalink / raw)
  To: u-boot

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 <alpernebiyasak@gmail.com>
---

 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 at 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
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error
  2020-09-30 11:46 [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Alper Nebi Yasak
@ 2020-09-30 11:46 ` Alper Nebi Yasak
  2020-10-05  1:52   ` Simon Glass
  2020-10-05  1:52 ` [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Simon Glass
  1 sibling, 1 reply; 4+ messages in thread
From: Alper Nebi Yasak @ 2020-09-30 11:46 UTC (permalink / raw)
  To: u-boot

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 <alpernebiyasak@gmail.com>
---

 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 {
-- 
2.28.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling
  2020-09-30 11:46 [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Alper Nebi Yasak
  2020-09-30 11:46 ` [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error Alper Nebi Yasak
@ 2020-10-05  1:52 ` Simon Glass
  1 sibling, 0 replies; 4+ messages in thread
From: Simon Glass @ 2020-10-05  1:52 UTC (permalink / raw)
  To: u-boot

On Wed, 30 Sep 2020 at 05:46, Alper Nebi Yasak <alpernebiyasak@gmail.com> wrote:
>
> 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 <alpernebiyasak@gmail.com>
> ---
>
>  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(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error
  2020-09-30 11:46 ` [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error Alper Nebi Yasak
@ 2020-10-05  1:52   ` Simon Glass
  0 siblings, 0 replies; 4+ messages in thread
From: Simon Glass @ 2020-10-05  1:52 UTC (permalink / raw)
  To: u-boot

Hi Alper,

On Wed, 30 Sep 2020 at 05:46, Alper Nebi Yasak <alpernebiyasak@gmail.com> wrote:
>
> 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 <alpernebiyasak@gmail.com>
> ---
>
>  scripts/checkpatch.pl | 6 ++++++
>  1 file changed, 6 insertions(+)
>

This looks good but please add a test to patman too.

Regards,
Simon

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-05  1:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-30 11:46 [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Alper Nebi Yasak
2020-09-30 11:46 ` [PATCH 2/2] checkpatch.pl: Make CONFIG_IS_ENABLED(CONFIG_*) an error Alper Nebi Yasak
2020-10-05  1:52   ` Simon Glass
2020-10-05  1:52 ` [PATCH 1/2] treewide: Fix wrong CONFIG_IS_ENABLED() handling Simon Glass

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.