From dcf4855fa43d4dd65a8058e7aace1a220db80f42 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 19 Mar 2025 18:54:42 +0100 Subject: [PATCH] drivers: clock_control: fix IN_RANGE() use in stm32 clock drivers IN_RANGE() macro from zephyr/sys/util.h returns a boolean value so it should be treated as such and not compared to a decimal value. Fix stm32 clock drivers accordingly and simplify places where the value is compared to true. No functional change. Signed-off-by: Etienne Carriere --- drivers/clock_control/clock_stm32_ll_common.c | 6 +++--- drivers/clock_control/clock_stm32_ll_h5.c | 4 ++-- drivers/clock_control/clock_stm32_ll_h7.c | 4 ++-- drivers/clock_control/clock_stm32_ll_n6.c | 4 ++-- drivers/clock_control/clock_stm32_ll_u5.c | 6 +++--- drivers/clock_control/clock_stm32_ll_wba.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c index a2cff13d571..982f8f22b2a 100644 --- a/drivers/clock_control/clock_stm32_ll_common.c +++ b/drivers/clock_control/clock_stm32_ll_common.c @@ -255,7 +255,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to change a wrong periph clock bit */ return -ENOTSUP; } @@ -278,7 +278,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -498,7 +498,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) { + if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Gated clocks */ if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr) == pclken->enr) { diff --git a/drivers/clock_control/clock_stm32_ll_h5.c b/drivers/clock_control/clock_stm32_ll_h5.c index 486861a32fd..4f677eae5e1 100644 --- a/drivers/clock_control/clock_stm32_ll_h5.c +++ b/drivers/clock_control/clock_stm32_ll_h5.c @@ -152,7 +152,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -173,7 +173,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c index bd0b090d69b..912f5795e72 100644 --- a/drivers/clock_control/clock_stm32_ll_h7.c +++ b/drivers/clock_control/clock_stm32_ll_h7.c @@ -390,7 +390,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -416,7 +416,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } diff --git a/drivers/clock_control/clock_stm32_ll_n6.c b/drivers/clock_control/clock_stm32_ll_n6.c index 3a1a9538bfd..7e81bbc3292 100644 --- a/drivers/clock_control/clock_stm32_ll_n6.c +++ b/drivers/clock_control/clock_stm32_ll_n6.c @@ -198,7 +198,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -221,7 +221,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } diff --git a/drivers/clock_control/clock_stm32_ll_u5.c b/drivers/clock_control/clock_stm32_ll_u5.c index 770c535209f..27e7e6fac2f 100644 --- a/drivers/clock_control/clock_stm32_ll_u5.c +++ b/drivers/clock_control/clock_stm32_ll_u5.c @@ -158,7 +158,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -179,7 +179,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -373,7 +373,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) { + if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Gated clocks */ if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr) == pclken->enr) { diff --git a/drivers/clock_control/clock_stm32_ll_wba.c b/drivers/clock_control/clock_stm32_ll_wba.c index 4895d862b47..d4660db2918 100644 --- a/drivers/clock_control/clock_stm32_ll_wba.c +++ b/drivers/clock_control/clock_stm32_ll_wba.c @@ -70,7 +70,7 @@ static inline int stm32_clock_control_on(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -91,7 +91,7 @@ static inline int stm32_clock_control_off(const struct device *dev, ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == 0) { + if (!IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Attempt to toggle a wrong periph clock bit */ return -ENOTSUP; } @@ -287,7 +287,7 @@ static enum clock_control_status stm32_clock_control_get_status(const struct dev ARG_UNUSED(dev); - if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX) == true) { + if (IN_RANGE(pclken->bus, STM32_PERIPH_BUS_MIN, STM32_PERIPH_BUS_MAX)) { /* Gated clocks */ if ((sys_read32(DT_REG_ADDR(DT_NODELABEL(rcc)) + pclken->bus) & pclken->enr) == pclken->enr) {