can: at91_can: MID registers: convert access to FIELD_PREP(), FIELD_GET()

Use FIELD_PREP() and FIELD_GET() to access the individual fields of
the MID register.

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

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 16a62f649418b1a5b86fc9ab5e8975cab7c9521a..ec028fe833f0255f9b8b621a27a535b4fb94266d 100644 (file)
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -79,6 +79,8 @@ enum at91_reg {
 #define AT91_MMR_PRIOR_MASK GENMASK(19, 16)
 #define AT91_MMR_MOT_MASK GENMASK(26, 24)
 
+#define AT91_MID_MIDVB_MASK GENMASK(17, 0)
+#define AT91_MID_MIDVA_MASK GENMASK(28, 18)
 #define AT91_MID_MIDE BIT(29)
 
 #define AT91_MSR_MRTR BIT(20)
@@ -320,9 +322,10 @@ static inline u32 at91_can_id_to_reg_mid(canid_t can_id)
        u32 reg_mid;
 
        if (can_id & CAN_EFF_FLAG)
-               reg_mid = (can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
+               reg_mid = FIELD_PREP(AT91_MID_MIDVA_MASK | AT91_MID_MIDVB_MASK, can_id) |
+                       AT91_MID_MIDE;
        else
-               reg_mid = (can_id & CAN_SFF_MASK) << 18;
+               reg_mid = FIELD_PREP(AT91_MID_MIDVA_MASK, can_id);
 
        return reg_mid;
 }
@@ -590,9 +593,10 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,
 
        reg_mid = at91_read(priv, AT91_MID(mb));
        if (reg_mid & AT91_MID_MIDE)
-               cf->can_id = ((reg_mid >> 0) & CAN_EFF_MASK) | CAN_EFF_FLAG;
+               cf->can_id = FIELD_GET(AT91_MID_MIDVA_MASK | AT91_MID_MIDVB_MASK, reg_mid) |
+                       CAN_EFF_FLAG;
        else
-               cf->can_id = (reg_mid >> 18) & CAN_SFF_MASK;
+               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);