From f97c1c9d86ff56ba9d1de4fc7c9499742224d365 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Tue, 3 Dec 2019 18:22:06 +0100 Subject: {nb,soc}: Replace min/max() with MIN/MAX() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use MIN() and MAX() defined in commonlib/helpers.h Change-Id: I02d0a47937bc2d6ab2cd01995a2c6b6db245da15 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/37454 Reviewed-by: Kyösti Mälkki Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/soc/amd/common/block/spi/fch_spi_flash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/soc/amd/common') diff --git a/src/soc/amd/common/block/spi/fch_spi_flash.c b/src/soc/amd/common/block/spi/fch_spi_flash.c index 72bc5d6ea5..d8eeefc7ed 100644 --- a/src/soc/amd/common/block/spi/fch_spi_flash.c +++ b/src/soc/amd/common/block/spi/fch_spi_flash.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -31,7 +32,7 @@ static void spi_flash_addr(u32 addr, u8 *cmd) static int crop_chunk(unsigned int cmd_len, unsigned int buf_len) { - return min((SPI_FIFO_DEPTH - (cmd_len - 1)), buf_len); + return MIN((SPI_FIFO_DEPTH - (cmd_len - 1)), buf_len); } int fch_spi_flash_cmd_write(const u8 *cmd, size_t cmd_len, const void *data, size_t data_len) @@ -192,7 +193,7 @@ static int fch_spi_flash_write(const struct spi_flash *flash, uint32_t offset, s for (actual = start; actual < len; actual += chunk_len) { byte_addr = offset % page_size; - chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = MIN(len - actual, page_size - byte_addr); chunk_len = crop_chunk(sizeof(cmd), chunk_len); cmd[0] = spi_data_ptr->write_cmd; -- cgit v1.2.3