Skip to content

Commit 726213c

Browse files
bijudasmarckleinebudde
authored andcommitted
can: rcar_canfd: Update RCANFD_CFG_* macros
Update RCANFD_CFG_* macros to give a meaning to the magic number using GENMASK macro and extract the values using FIELD_PREP macro. Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Link: https://patch.msgid.link/20250908120940.147196-3-biju.das.jz@bp.renesas.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 100fafc commit 726213c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/net/can/rcar/rcar_canfd.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@
103103
/* Channel register bits */
104104

105105
/* RSCFDnCmCFG - Classical CAN only */
106-
#define RCANFD_CFG_SJW(x) (((x) & 0x3) << 24)
107-
#define RCANFD_CFG_TSEG2(x) (((x) & 0x7) << 20)
108-
#define RCANFD_CFG_TSEG1(x) (((x) & 0xf) << 16)
109-
#define RCANFD_CFG_BRP(x) (((x) & 0x3ff) << 0)
106+
#define RCANFD_CFG_SJW GENMASK(25, 24)
107+
#define RCANFD_CFG_TSEG2 GENMASK(22, 20)
108+
#define RCANFD_CFG_TSEG1 GENMASK(19, 16)
109+
#define RCANFD_CFG_BRP GENMASK(9, 0)
110110

111111
/* RSCFDnCFDCmNCFG - CAN FD only */
112112
#define RCANFD_NCFG_NTSEG2(gpriv, x) \
@@ -1411,8 +1411,8 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev)
14111411
cfg = (RCANFD_NCFG_NTSEG1(gpriv, tseg1) | RCANFD_NCFG_NBRP(brp) |
14121412
RCANFD_NCFG_NSJW(gpriv, sjw) | RCANFD_NCFG_NTSEG2(gpriv, tseg2));
14131413
} else {
1414-
cfg = (RCANFD_CFG_TSEG1(tseg1) | RCANFD_CFG_BRP(brp) |
1415-
RCANFD_CFG_SJW(sjw) | RCANFD_CFG_TSEG2(tseg2));
1414+
cfg = FIELD_PREP(RCANFD_CFG_TSEG1, tseg1) | FIELD_PREP(RCANFD_CFG_BRP, brp) |
1415+
FIELD_PREP(RCANFD_CFG_SJW, sjw) | FIELD_PREP(RCANFD_CFG_TSEG2, tseg2);
14161416
}
14171417

14181418
rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg);

0 commit comments

Comments
 (0)