diff --git a/drivers/io/io_mtd.c b/drivers/io/io_mtd.c index ba8cecdfb..5d86592db 100644 --- a/drivers/io/io_mtd.c +++ b/drivers/io/io_mtd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2019-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,13 +8,13 @@ #include #include -#include - #include #include #include #include +#include + typedef struct { io_mtd_dev_spec_t *dev_spec; uintptr_t base; @@ -214,7 +214,7 @@ static int mtd_read(io_entity_t *entity, uintptr_t buffer, size_t length, ops = &cur->dev_spec->ops; assert(ops->read != NULL); - VERBOSE("Read at %llx into %lx, length %zi\n", + VERBOSE("Read at %llx into %lx, length %zu\n", cur->base + cur->pos, buffer, length); if ((cur->base + cur->pos + length) > cur->dev_spec->device_size) { return -EINVAL; diff --git a/drivers/mtd/nand/spi_nand.c b/drivers/mtd/nand/spi_nand.c index abb524d7f..542b614ff 100644 --- a/drivers/mtd/nand/spi_nand.c +++ b/drivers/mtd/nand/spi_nand.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, STMicroelectronics - All Rights Reserved + * Copyright (c) 2019-2022, STMicroelectronics - All Rights Reserved * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,13 +8,13 @@ #include #include -#include - #include #include #include #include +#include + #define SPI_NAND_MAX_ID_LEN 4U #define DELAY_US_400MS 400000U #define MACRONIX_ID 0xC2U @@ -246,7 +246,7 @@ static int spi_nand_mtd_block_is_bad(unsigned int block) if ((bbm_marker[0] != GENMASK_32(7, 0)) || (bbm_marker[1] != GENMASK_32(7, 0))) { - WARN("Block %i is bad\n", block); + WARN("Block %u is bad\n", block); return 1; } @@ -312,7 +312,7 @@ int spi_nand_init(unsigned long long *size, unsigned int *erase_size) VERBOSE("SPI_NAND Detected ID 0x%x\n", id[1]); - VERBOSE("Page size %i, Block size %i, size %lli\n", + VERBOSE("Page size %u, Block size %u, size %llu\n", spinand_dev.nand_dev->page_size, spinand_dev.nand_dev->block_size, spinand_dev.nand_dev->size); diff --git a/drivers/mtd/nor/spi_nor.c b/drivers/mtd/nor/spi_nor.c index 6b4643e89..2e343448a 100644 --- a/drivers/mtd/nor/spi_nor.c +++ b/drivers/mtd/nor/spi_nor.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, STMicroelectronics - All Rights Reserved + * Copyright (c) 2019-2022, STMicroelectronics - All Rights Reserved * * SPDX-License-Identifier: BSD-3-Clause */ @@ -284,7 +284,7 @@ int spi_nor_read(unsigned int offset, uintptr_t buffer, size_t length, nor_dev.read_op.addr.val = offset; nor_dev.read_op.data.buf = (void *)buffer; - VERBOSE("%s offset %i length %zu\n", __func__, offset, length); + VERBOSE("%s offset %u length %zu\n", __func__, offset, length); while (length != 0U) { if ((nor_dev.flags & SPI_NOR_USE_BANK) != 0U) { diff --git a/drivers/mtd/spi-mem/spi_mem.c b/drivers/mtd/spi-mem/spi_mem.c index 010e8b62a..c43d5196c 100644 --- a/drivers/mtd/spi-mem/spi_mem.c +++ b/drivers/mtd/spi-mem/spi_mem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, STMicroelectronics - All Rights Reserved + * Copyright (c) 2019-2022, STMicroelectronics - All Rights Reserved * * SPDX-License-Identifier: BSD-3-Clause */ @@ -8,10 +8,9 @@ #include #include -#include - #include #include +#include #define SPI_MEM_DEFAULT_SPEED_HZ 100000U @@ -258,7 +257,7 @@ int spi_mem_init_slave(void *fdt, int bus_node, const struct spi_bus_ops *ops) mode |= SPI_TX_QUAD; break; default: - WARN("spi-tx-bus-width %d not supported\n", + WARN("spi-tx-bus-width %u not supported\n", fdt32_to_cpu(*cuint)); return -EINVAL; } @@ -276,7 +275,7 @@ int spi_mem_init_slave(void *fdt, int bus_node, const struct spi_bus_ops *ops) mode |= SPI_RX_QUAD; break; default: - WARN("spi-rx-bus-width %d not supported\n", + WARN("spi-rx-bus-width %u not supported\n", fdt32_to_cpu(*cuint)); return -EINVAL; }