From 09f54c98a71f84cbc4918c9c148b0eb79ffd1a48 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Tue, 27 May 2025 20:15:01 +0000 Subject: [PATCH] drivers: can: rcar: declare the loop condition variables inside the loops Declare the loop condition variable inside the loops to limit their scope. Signed-off-by: Henrik Brix Andersen --- drivers/can/can_rcar.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/can/can_rcar.c b/drivers/can/can_rcar.c index d4d1f542ec3..6da1db35f71 100644 --- a/drivers/can/can_rcar.c +++ b/drivers/can/can_rcar.c @@ -474,12 +474,11 @@ static void can_rcar_isr(const struct device *dev) static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config) { uint16_t ctlr, str; - int i; ctlr = can_rcar_read16(config, RCAR_CAN_CTLR); ctlr &= ~RCAR_CAN_CTLR_SLPM; can_rcar_write16(config, RCAR_CAN_CTLR, ctlr); - for (i = 0; i < MAX_STR_READS; i++) { + for (int i = 0; i < MAX_STR_READS; i++) { str = can_rcar_read16(config, RCAR_CAN_STR); if (!(str & RCAR_CAN_STR_SLPST)) { return 0; @@ -491,7 +490,6 @@ static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config) static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool force) { uint16_t ctlr; - int i; ctlr = can_rcar_read16(config, RCAR_CAN_CTLR); ctlr &= ~RCAR_CAN_CTLR_CANM_MASK; @@ -500,7 +498,7 @@ static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool for ctlr |= RCAR_CAN_CTLR_CANM_HALT; } can_rcar_write16(config, RCAR_CAN_CTLR, ctlr); - for (i = 0; i < MAX_STR_READS; i++) { + for (int i = 0; i < MAX_STR_READS; i++) { if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_RSTST) { return 0; } @@ -511,7 +509,6 @@ static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool for static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config) { uint16_t ctlr; - int i; ctlr = can_rcar_read16(config, RCAR_CAN_CTLR); ctlr &= ~RCAR_CAN_CTLR_CANM_MASK; @@ -521,7 +518,7 @@ static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config) /* Wait for controller to apply high bit timing settings */ k_usleep(1); - for (i = 0; i < MAX_STR_READS; i++) { + for (int i = 0; i < MAX_STR_READS; i++) { if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_HLTST) { return 0; }