]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: rcar_can: Convert to FIELD_MODIFY()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 5 Mar 2026 10:14:37 +0000 (11:14 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 1 Apr 2026 07:27:58 +0000 (09:27 +0200)
Use the FIELD_MODIFY() helper instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/ee2e6aaacd5e061c972716ecaf8a929be7ef5f2e.1772705647.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/rcar/rcar_can.c

index fc3df328e877c8fe294eb88f6d54a7a35eeb428e..2727c5ce029c1baa59dc6241f94b57fc982a5093 100644 (file)
@@ -496,8 +496,7 @@ static void rcar_can_start(struct net_device *ndev)
        priv->can.state = CAN_STATE_ERROR_ACTIVE;
 
        /* Go to operation mode */
-       ctlr &= ~RCAR_CAN_CTLR_CANM;
-       ctlr |= FIELD_PREP(RCAR_CAN_CTLR_CANM, RCAR_CAN_CTLR_CANM_OPER);
+       FIELD_MODIFY(RCAR_CAN_CTLR_CANM, &ctlr, RCAR_CAN_CTLR_CANM_OPER);
        writew(ctlr, &priv->regs->ctlr);
        for (i = 0; i < MAX_STR_READS; i++) {
                if (!(readw(&priv->regs->str) & RCAR_CAN_STR_RSTST))