Skip to content

Commit 214b9c5

Browse files
henrikbrixandersenkartben
authored andcommitted
drivers: can: mcp2515: declare the variable "data_idx" inside the loops
Declare the variable "data_idx" inside the loops to limit it's scope. Signed-off-by: Henrik Brix Andersen <[email protected]>
1 parent 8b6c2b1 commit 214b9c5

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/can/can_mcp2515.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ static void mcp2515_convert_canframe_to_mcp2515frame(const struct can_frame
202202
{
203203
uint8_t rtr;
204204
uint8_t dlc;
205-
uint8_t data_idx;
206205

207206
if ((source->flags & CAN_FRAME_IDE) != 0) {
208207
target[MCP2515_FRAME_OFFSET_SIDH] = source->id >> 21;
@@ -223,7 +222,7 @@ static void mcp2515_convert_canframe_to_mcp2515frame(const struct can_frame
223222
target[MCP2515_FRAME_OFFSET_DLC] = rtr | dlc;
224223

225224
if (rtr == 0U) {
226-
for (data_idx = 0U; data_idx < dlc; data_idx++) {
225+
for (uint8_t data_idx = 0U; data_idx < dlc; data_idx++) {
227226
target[MCP2515_FRAME_OFFSET_D0 + data_idx] =
228227
source->data[data_idx];
229228
}
@@ -233,8 +232,6 @@ static void mcp2515_convert_canframe_to_mcp2515frame(const struct can_frame
233232
static void mcp2515_convert_mcp2515frame_to_canframe(const uint8_t *source,
234233
struct can_frame *target)
235234
{
236-
uint8_t data_idx;
237-
238235
memset(target, 0, sizeof(*target));
239236

240237
if (source[MCP2515_FRAME_OFFSET_SIDL] & BIT(3)) {
@@ -255,7 +252,7 @@ static void mcp2515_convert_mcp2515frame_to_canframe(const uint8_t *source,
255252
if ((source[MCP2515_FRAME_OFFSET_DLC] & BIT(6)) != 0) {
256253
target->flags |= CAN_FRAME_RTR;
257254
} else {
258-
for (data_idx = 0U; data_idx < target->dlc; data_idx++) {
255+
for (uint8_t data_idx = 0U; data_idx < target->dlc; data_idx++) {
259256
target->data[data_idx] = source[MCP2515_FRAME_OFFSET_D0 +
260257
data_idx];
261258
}

0 commit comments

Comments
 (0)