can: rcar_canfd: Return early in rcar_canfd_set_bittiming() when not FD

Return early after completing all setup for non-FD mode in
rcar_canfd_set_bittiming(), to prepare for the advent of more FD-only
setup.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/35fcdcad026cfdd0fd361637f065842d99a6c19d.1749655315.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index 9ee49ef57e4f9c8eae1a0020c2febe3e39d533c1..3340ae75bbecdb5b74e111926d83670dcc24be39 100644 (file)
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1484,18 +1484,19 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev)
 
        rcar_canfd_write(priv->base, RCANFD_CCFG(ch), cfg);
 
-       if (priv->can.ctrlmode & CAN_CTRLMODE_FD) {
-               /* Data bit timing settings */
-               brp = dbt->brp - 1;
-               sjw = dbt->sjw - 1;
-               tseg1 = dbt->prop_seg + dbt->phase_seg1 - 1;
-               tseg2 = dbt->phase_seg2 - 1;
+       if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD))
+               return;
 
-               cfg = (RCANFD_DCFG_DTSEG1(gpriv, tseg1) | RCANFD_DCFG_DBRP(brp) |
-                      RCANFD_DCFG_DSJW(gpriv, sjw) | RCANFD_DCFG_DTSEG2(gpriv, tseg2));
+       /* Data bit timing settings */
+       brp = dbt->brp - 1;
+       sjw = dbt->sjw - 1;
+       tseg1 = dbt->prop_seg + dbt->phase_seg1 - 1;
+       tseg2 = dbt->phase_seg2 - 1;
 
-               rcar_canfd_write(priv->base, rcar_canfd_f_dcfg(gpriv, ch), cfg);
-       }
+       cfg = (RCANFD_DCFG_DTSEG1(gpriv, tseg1) | RCANFD_DCFG_DBRP(brp) |
+              RCANFD_DCFG_DSJW(gpriv, sjw) | RCANFD_DCFG_DTSEG2(gpriv, tseg2));
+
+       rcar_canfd_write(priv->base, rcar_canfd_f_dcfg(gpriv, ch), cfg);
 }
 
 static int rcar_canfd_start(struct net_device *ndev)