can: rcar_can: Convert to GENMASK()

Use the GENMASK() macro instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/3f947f0f91a8857a2cbce74807e42258e9f209ca.1755857536.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
index c47ee4e41eb62d9e98c854f063f269e5d781d9d9..7b94224bbc9b36fa4adf41fab23f62f909f52999 100644 (file)
--- a/drivers/net/can/rcar/rcar_can.c
+++ b/drivers/net/can/rcar/rcar_can.c
@@ -114,16 +114,16 @@ static const struct can_bittiming_const rcar_can_bittiming_const = {
 };
 
 /* Control Register bits */
-#define RCAR_CAN_CTLR_BOM      (3 << 11) /* Bus-Off Recovery Mode Bits */
+#define RCAR_CAN_CTLR_BOM      GENMASK(12, 11) /* Bus-Off Recovery Mode Bits */
 #define RCAR_CAN_CTLR_BOM_ENT  (1 << 11) /* Entry to halt mode */
                                        /* at bus-off entry */
 #define RCAR_CAN_CTLR_SLPM     BIT(10)         /* Sleep Mode */
-#define RCAR_CAN_CTLR_CANM     (3 << 8) /* Operating Mode Select Bit */
+#define RCAR_CAN_CTLR_CANM     GENMASK(9, 8)   /* Operating Mode Select Bit */
 #define RCAR_CAN_CTLR_CANM_HALT        (1 << 9)
 #define RCAR_CAN_CTLR_CANM_RESET (1 << 8)
 #define RCAR_CAN_CTLR_CANM_FORCE_RESET (3 << 8)
 #define RCAR_CAN_CTLR_MLM      BIT(3)          /* Message Lost Mode Select */
-#define RCAR_CAN_CTLR_IDFM     (3 << 1) /* ID Format Mode Select Bits */
+#define RCAR_CAN_CTLR_IDFM     GENMASK(2, 1)   /* ID Format Mode Select Bits */
 #define RCAR_CAN_CTLR_IDFM_MIXED (1 << 2) /* Mixed ID mode */
 #define RCAR_CAN_CTLR_MBM      BIT(0)          /* Mailbox Mode select */
 
@@ -139,7 +139,7 @@ static const struct can_bittiming_const rcar_can_bittiming_const = {
 #define RCAR_CAN_RFCR_RFE      BIT(0)          /* Receive FIFO Enable */
 
 /* Transmit FIFO Control Register bits */
-#define RCAR_CAN_TFCR_TFUST    (7 << 1)        /* Transmit FIFO Unsent Message */
+#define RCAR_CAN_TFCR_TFUST    GENMASK(3, 1)   /* Transmit FIFO Unsent Message */
                                                /* Number Status Bits */
 #define RCAR_CAN_TFCR_TFUST_SHIFT 1            /* Offset of Transmit FIFO Unsent */
                                                /* Message Number Status Bits */