From e7d0a37501afa7670363626e678f822a3cb3a0c9 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 24 Jun 2017 14:02:00 -0600 Subject: drivers/spi: add IS_ENABLED() around Kconfig symbol references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these can be changed from #if to if(), but that will happen in a follow-on commmit. Change-Id: If80e0c4e1c9911b44853561b03aef1c741255229 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20339 Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Reinauer --- src/drivers/spi/adesto.c | 4 ++-- src/drivers/spi/amic.c | 4 ++-- src/drivers/spi/atmel.c | 4 ++-- src/drivers/spi/eon.c | 4 ++-- src/drivers/spi/gigadevice.c | 4 ++-- src/drivers/spi/macronix.c | 4 ++-- src/drivers/spi/spansion.c | 4 ++-- src/drivers/spi/spi_flash.c | 24 ++++++++++++------------ src/drivers/spi/sst.c | 10 +++++----- src/drivers/spi/stmicro.c | 4 ++-- src/drivers/spi/winbond.c | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/drivers/spi') diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 3e857fcbf8..3e3e7d4dab 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -90,7 +90,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -116,7 +116,7 @@ static int adesto_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: adesto: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index 239681cdc5..64bdab3fb0 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -72,7 +72,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -99,7 +99,7 @@ static int amic_write(const struct spi_flash *flash, u32 offset, size_t len, byte_addr = 0; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: AMIC: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/atmel.c b/src/drivers/spi/atmel.c index 07bbf1686b..d81e0e3729 100644 --- a/src/drivers/spi/atmel.c +++ b/src/drivers/spi/atmel.c @@ -118,7 +118,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -144,7 +144,7 @@ static int atmel_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Atmel: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/eon.c b/src/drivers/spi/eon.c index a072e4e223..49b56b4ace 100644 --- a/src/drivers/spi/eon.c +++ b/src/drivers/spi/eon.c @@ -95,7 +95,7 @@ static int eon_write(const struct spi_flash *flash, cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -117,7 +117,7 @@ static int eon_write(const struct spi_flash *flash, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: EON: Successfully programmed %zu bytes @ %#x\n", len, (unsigned int)(offset - len)); #endif diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index becc215e76..2d7544c485 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -136,7 +136,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP gigadevice.c: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, @@ -158,7 +158,7 @@ static int gigadevice_write(const struct spi_flash *flash, u32 offset, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF gigadevice.c: Successfully programmed %zu bytes @ %#x\n", len, (unsigned int)(offset - len)); diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index fd2d25b6e4..b7f2c49691 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -158,7 +158,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -184,7 +184,7 @@ static int macronix_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Macronix: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c index cb528d3916..16c5180011 100644 --- a/src/drivers/spi/spansion.c +++ b/src/drivers/spi/spansion.c @@ -212,7 +212,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -238,7 +238,7 @@ static int spansion_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SPANSION: Successfully programmed %zu bytes @ 0x%x\n", len, offset); #endif diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c index 04bea35402..2dd616bb65 100644 --- a/src/drivers/spi/spi_flash.c +++ b/src/drivers/spi/spi_flash.c @@ -187,7 +187,7 @@ int spi_flash_cmd_erase(const struct spi_flash *flash, u32 offset, size_t len) spi_flash_addr(offset, cmd); offset += erase_size; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1], cmd[2], cmd[3], offset); #endif @@ -246,38 +246,38 @@ static struct { struct spi_flash *flash); } flashes[] = { /* Keep it sorted by define name */ -#if CONFIG_SPI_FLASH_AMIC +#if IS_ENABLED(CONFIG_SPI_FLASH_AMIC) { 0, 0x37, spi_flash_probe_amic, }, #endif -#if CONFIG_SPI_FLASH_ATMEL +#if IS_ENABLED(CONFIG_SPI_FLASH_ATMEL) { 0, 0x1f, spi_flash_probe_atmel, }, #endif -#if CONFIG_SPI_FLASH_EON +#if IS_ENABLED(CONFIG_SPI_FLASH_EON) { 0, 0x1c, spi_flash_probe_eon, }, #endif -#if CONFIG_SPI_FLASH_GIGADEVICE +#if IS_ENABLED(CONFIG_SPI_FLASH_GIGADEVICE) { 0, 0xc8, spi_flash_probe_gigadevice, }, #endif -#if CONFIG_SPI_FLASH_MACRONIX +#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX) { 0, 0xc2, spi_flash_probe_macronix, }, #endif -#if CONFIG_SPI_FLASH_SPANSION +#if IS_ENABLED(CONFIG_SPI_FLASH_SPANSION) { 0, 0x01, spi_flash_probe_spansion, }, #endif -#if CONFIG_SPI_FLASH_SST +#if IS_ENABLED(CONFIG_SPI_FLASH_SST) { 0, 0xbf, spi_flash_probe_sst, }, #endif -#if CONFIG_SPI_FLASH_STMICRO +#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO) { 0, 0x20, spi_flash_probe_stmicro, }, #endif -#if CONFIG_SPI_FLASH_WINBOND +#if IS_ENABLED(CONFIG_SPI_FLASH_WINBOND) { 0, 0xef, spi_flash_probe_winbond, }, #endif /* Keep it sorted by best detection */ -#if CONFIG_SPI_FLASH_STMICRO +#if IS_ENABLED(CONFIG_SPI_FLASH_STMICRO) { 0, 0xff, spi_flash_probe_stmicro, }, #endif -#if CONFIG_SPI_FLASH_ADESTO +#if IS_ENABLED(CONFIG_SPI_FLASH_ADESTO) { 0, 0x1f, spi_flash_probe_adesto, }, #endif }; diff --git a/src/drivers/spi/sst.c b/src/drivers/spi/sst.c index ce67e9b308..559969a0ba 100644 --- a/src/drivers/spi/sst.c +++ b/src/drivers/spi/sst.c @@ -153,7 +153,7 @@ sst_byte_write(const struct spi_flash *flash, u32 offset, const void *buf) offset, }; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "BP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", spi_w8r8(&flash->spi, CMD_SST_RDSR), buf, cmd[0], offset); #endif @@ -208,7 +208,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -235,7 +235,7 @@ static int sst_write_256(const struct spi_flash *flash, u32 offset, size_t len, } done: -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", ret ? "failure" : "success", len, (unsigned long)offset - actual); #endif @@ -269,7 +269,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, cmd[3] = offset; for (; actual < len - 1; actual += 2) { -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "WP[%02x]: 0x%p => cmd = { 0x%02x 0x%06x }\n", spi_w8r8(&flash->spi, CMD_SST_RDSR), buf + actual, cmd[0], offset); @@ -298,7 +298,7 @@ static int sst_write_ai(const struct spi_flash *flash, u32 offset, size_t len, ret = sst_byte_write(flash, offset, buf + actual); done: -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: SST: program %s %zu bytes @ 0x%lx\n", ret ? "failure" : "success", len, (unsigned long)offset - actual); #endif diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index 68eb37b3e1..240d182b60 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -186,7 +186,7 @@ static int stmicro_write(const struct spi_flash *flash, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -212,7 +212,7 @@ static int stmicro_write(const struct spi_flash *flash, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: STMicro: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 77064ea52c..2fc8209965 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -148,7 +148,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); @@ -174,7 +174,7 @@ static int winbond_write(const struct spi_flash *flash, u32 offset, size_t len, offset += chunk_len; } -#if CONFIG_DEBUG_SPI_FLASH +#if IS_ENABLED(CONFIG_DEBUG_SPI_FLASH) printk(BIOS_SPEW, "SF: Winbond: Successfully programmed %zu bytes @" " 0x%lx\n", len, (unsigned long)(offset - len)); #endif -- cgit v1.2.3