]> git.itanic.dy.fi Git - linux-stable/commitdiff
can: at91_can: MSR Register: convert to FIELD_PREP()
authorMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 18 Apr 2023 14:35:54 +0000 (16:35 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 5 Oct 2023 19:45:48 +0000 (21:45 +0200)
Use FIELD_PREP() to access the individual fields of the MSR register.

Link: https://lore.kernel.org/all/20231005-at91_can-rx_offload-v2-8-9987d53600e0@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/at91_can.c

index ec028fe833f0255f9b8b621a27a535b4fb94266d..41dd2ea239b9f6ae5833d3e1d9fcfea085c2056f 100644 (file)
@@ -83,6 +83,8 @@ enum at91_reg {
 #define AT91_MID_MIDVA_MASK GENMASK(28, 18)
 #define AT91_MID_MIDE BIT(29)
 
+#define AT91_MSR_MTIMESTAMP_MASK GENMASK(15, 0)
+#define AT91_MSR_MDLC_MASK GENMASK(19, 16)
 #define AT91_MSR_MRTR BIT(20)
 #define AT91_MSR_MABT BIT(22)
 #define AT91_MSR_MRDY BIT(23)
@@ -599,7 +601,7 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
                cf->can_id = FIELD_GET(AT91_MID_MIDVA_MASK, reg_mid);
 
        reg_msr = at91_read(priv, AT91_MSR(mb));
-       cf->len = can_cc_dlc2len((reg_msr >> 16) & 0xf);
+       cf->len = can_cc_dlc2len(FIELD_GET(AT91_MSR_MDLC_MASK, reg_msr));
 
        if (reg_msr & AT91_MSR_MRTR) {
                cf->can_id |= CAN_RTR_FLAG;