From d647a85fb520a429bdec8dd389ea13b379884331 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Wed, 23 Aug 2023 16:11:49 +0000 Subject: [PATCH] drivers/flash/stm32/Xspi: Fix llvm compilation error Fix compilation error on variable used for size of array in OSPI and QSPI drivers. Fixes #61804 Signed-off-by: Dominik Ermel --- drivers/flash/flash_stm32_ospi.c | 5 +++-- drivers/flash/flash_stm32_qspi.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/flash/flash_stm32_ospi.c b/drivers/flash/flash_stm32_ospi.c index 26f82411789..6f7cf0cc2a9 100644 --- a/drivers/flash/flash_stm32_ospi.c +++ b/drivers/flash/flash_stm32_ospi.c @@ -2203,13 +2203,14 @@ static int flash_stm32_ospi_init(const struct device *dev) if (id == JESD216_SFDP_PARAM_ID_BFP) { union { - uint32_t dw[MIN(php->len_dw, 20)]; + uint32_t dw[20]; struct jesd216_bfp bfp; } u2; const struct jesd216_bfp *bfp = &u2.bfp; ret = ospi_read_sfdp(dev, jesd216_param_addr(php), - (uint8_t *)u2.dw, sizeof(u2.dw)); + (uint8_t *)u2.dw, + MIN(sizeof(uint32_t) * php->len_dw, sizeof(u2.dw))); if (ret == 0) { ret = spi_nor_process_bfp(dev, php, bfp); } diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c index 5f8c8a0b218..4090cd41bbb 100644 --- a/drivers/flash/flash_stm32_qspi.c +++ b/drivers/flash/flash_stm32_qspi.c @@ -1309,13 +1309,14 @@ static int flash_stm32_qspi_init(const struct device *dev) if (id == JESD216_SFDP_PARAM_ID_BFP) { union { - uint32_t dw[MIN(php->len_dw, 20)]; + uint32_t dw[20]; struct jesd216_bfp bfp; } u2; const struct jesd216_bfp *bfp = &u2.bfp; ret = qspi_read_sfdp(dev, jesd216_param_addr(php), - (uint8_t *)u2.dw, sizeof(u2.dw)); + (uint8_t *)u2.dw, + MIN(sizeof(uint32_t) * php->len_dw, sizeof(u2.dw))); if (ret == 0) { ret = spi_nor_process_bfp(dev, php, bfp); }