Skip to content

Commit 49ffacb

Browse files
can: mcp251xfd: add missing _MASK postfix to MCP251XFD_OBJ_FLAGS_DLC
As MCP251XFD_OBJ_FLAGS_DLC is a mask, add the missing _MASK postfix, that all other masks in the driver have. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent f93486a commit 49ffacb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ mcp251xfd_hw_rx_obj_to_skb(const struct mcp251xfd_priv *priv,
14651465
hw_rx_obj->id);
14661466
}
14671467

1468-
dlc = FIELD_GET(MCP251XFD_OBJ_FLAGS_DLC, hw_rx_obj->flags);
1468+
dlc = FIELD_GET(MCP251XFD_OBJ_FLAGS_DLC_MASK, hw_rx_obj->flags);
14691469

14701470
/* CANFD */
14711471
if (hw_rx_obj->flags & MCP251XFD_OBJ_FLAGS_FDF) {
@@ -2359,7 +2359,7 @@ mcp251xfd_tx_obj_from_skb(const struct mcp251xfd_priv *priv,
23592359
priv->can.ctrlmode);
23602360
}
23612361

2362-
flags |= FIELD_PREP(MCP251XFD_OBJ_FLAGS_DLC, dlc);
2362+
flags |= FIELD_PREP(MCP251XFD_OBJ_FLAGS_DLC_MASK, dlc);
23632363

23642364
load_buf = &tx_obj->buf;
23652365
if (priv->devtype_data.quirks & MCP251XFD_QUIRK_CRC_TX)

drivers/net/can/spi/mcp251xfd/mcp251xfd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
#define MCP251XFD_OBJ_FLAGS_BRS BIT(6)
306306
#define MCP251XFD_OBJ_FLAGS_RTR BIT(5)
307307
#define MCP251XFD_OBJ_FLAGS_IDE BIT(4)
308-
#define MCP251XFD_OBJ_FLAGS_DLC GENMASK(3, 0)
308+
#define MCP251XFD_OBJ_FLAGS_DLC_MASK GENMASK(3, 0)
309309

310310
#define MCP251XFD_REG_FRAME_EFF_SID_MASK GENMASK(28, 18)
311311
#define MCP251XFD_REG_FRAME_EFF_EID_MASK GENMASK(17, 0)

0 commit comments

Comments
 (0)