Skip to content

Commit 09f54c9

Browse files
henrikbrixandersenkartben
authored andcommitted
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 <[email protected]>
1 parent 24a46a5 commit 09f54c9

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/can/can_rcar.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,12 +474,11 @@ static void can_rcar_isr(const struct device *dev)
474474
static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config)
475475
{
476476
uint16_t ctlr, str;
477-
int i;
478477

479478
ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
480479
ctlr &= ~RCAR_CAN_CTLR_SLPM;
481480
can_rcar_write16(config, RCAR_CAN_CTLR, ctlr);
482-
for (i = 0; i < MAX_STR_READS; i++) {
481+
for (int i = 0; i < MAX_STR_READS; i++) {
483482
str = can_rcar_read16(config, RCAR_CAN_STR);
484483
if (!(str & RCAR_CAN_STR_SLPST)) {
485484
return 0;
@@ -491,7 +490,6 @@ static int can_rcar_leave_sleep_mode(const struct can_rcar_cfg *config)
491490
static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool force)
492491
{
493492
uint16_t ctlr;
494-
int i;
495493

496494
ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
497495
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
500498
ctlr |= RCAR_CAN_CTLR_CANM_HALT;
501499
}
502500
can_rcar_write16(config, RCAR_CAN_CTLR, ctlr);
503-
for (i = 0; i < MAX_STR_READS; i++) {
501+
for (int i = 0; i < MAX_STR_READS; i++) {
504502
if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_RSTST) {
505503
return 0;
506504
}
@@ -511,7 +509,6 @@ static int can_rcar_enter_reset_mode(const struct can_rcar_cfg *config, bool for
511509
static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config)
512510
{
513511
uint16_t ctlr;
514-
int i;
515512

516513
ctlr = can_rcar_read16(config, RCAR_CAN_CTLR);
517514
ctlr &= ~RCAR_CAN_CTLR_CANM_MASK;
@@ -521,7 +518,7 @@ static int can_rcar_enter_halt_mode(const struct can_rcar_cfg *config)
521518
/* Wait for controller to apply high bit timing settings */
522519
k_usleep(1);
523520

524-
for (i = 0; i < MAX_STR_READS; i++) {
521+
for (int i = 0; i < MAX_STR_READS; i++) {
525522
if (can_rcar_read16(config, RCAR_CAN_STR) & RCAR_CAN_STR_HLTST) {
526523
return 0;
527524
}

0 commit comments

Comments
 (0)