Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: Fix wrong CONFIG_IS_ENABLED() handling

Browse source 
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 71ba2cb0d6 ("board: stm32mp1: correct CONFIG_IS_ENABLED usage for LED")
    commit a5ada25e42 ("rockchip: clk: fix wrong CONFIG_IS_ENABLED handling")
    commit 5daf6e56d3 ("common: console: Fix duplicated CONFIG in silent env callback")
    commit 48bfc31b64 ("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>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Alper Nebi Yasak 2020-10-05 09:57:29 +03:00 • committed by Tom Rini
parent 467d90a37e
commit 957a3e5493
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/clk/rockchip/clk_rk3399.c
View file

@ -1592,7 +1592,7 @@ static int rk3399_pmuclk_ofdata_to_platdata(struct udevice *dev)
static int rk3399_pmuclk_bind(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; int ret;
ret = offsetof(struct rk3399_pmucru, pmucru_softrst_con[0]); ret = offsetof(struct rk3399_pmucru, pmucru_softrst_con[0]);

10
drivers/spi/nxp_fspi.c
View file

@ -520,7 +520,7 @@ static void nxp_fspi_prepare_lut(struct nxp_fspi *f,
fspi_writel(f, FSPI_LCKER_LOCK, f->iobase + FSPI_LCKCR); 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) static int nxp_fspi_clk_prep_enable(struct nxp_fspi *f)
{ {
int ret; int ret;
@ -808,7 +808,7 @@ static int nxp_fspi_default_setup(struct nxp_fspi *f)
int ret, i; int ret, i;
u32 reg; u32 reg;
#if CONFIG_IS_ENABLED(CONFIG_CLK) #if CONFIG_IS_ENABLED(CLK)
/* disable and unprepare clock to avoid glitch pass to controller */ /* disable and unprepare clock to avoid glitch pass to controller */
nxp_fspi_clk_disable_unprep(f); 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) 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); struct nxp_fspi *f = dev_get_priv(bus);
int ret; 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) static int nxp_fspi_ofdata_to_platdata(struct udevice *bus)
{ {
struct nxp_fspi *f = dev_get_priv(bus); struct nxp_fspi *f = dev_get_priv(bus);
#if CONFIG_IS_ENABLED(CONFIG_CLK) #if CONFIG_IS_ENABLED(CLK)
int ret; int ret;
#endif #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->ahb_addr = map_physmem(ahb_addr, ahb_size, MAP_NOCACHE);
f->memmap_phy_size = ahb_size; 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); ret = clk_get_by_name(bus, "fspi_en", &f->clk_en);
if (ret) { if (ret) {
dev_err(bus, "failed to get fspi_en clock\n"); dev_err(bus, "failed to get fspi_en clock\n");

8
drivers/sysreset/sysreset_mpc83xx.c
View file

@ -106,7 +106,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size)
if (!force && !gd->arch.arbiter_event_address) if (!force && !gd->arch.arbiter_event_address)
return 0; return 0;
if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL)) { if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL)) {
res = snprintf(buf, size, res = snprintf(buf, size,
"Arbiter Event Status:\n" "Arbiter Event Status:\n"
" %s: 0x%08lX\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], "Master ID", mstr_id, master[mstr_id],
"Transfer Size", tsize_val, tsize_bytes, "Transfer Size", tsize_val, tsize_bytes,
"Transfer Type", ttype, transfer[ttype]); "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, res = snprintf(buf, size,
"Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n", "Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n",
gd->arch.arbiter_event_attributes, 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 * TODO(mario.six@gdsys.cc): Move this into a dedicated
* arbiter driver * arbiter driver
*/ */
if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL) || if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) ||
CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) {
/* /*
* If there was a bus monitor reset event, we force the arbiter * If there was a bus monitor reset event, we force the arbiter
* event to be printed * event to be printed