Commit 0acd4619 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Marc Kleine-Budde
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/35fcdcad026cfdd0fd361637f065842d99a6c19d.1749655315.git.geert+renesas@glider.be


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 0a0c94c6

drivers/net/can/rcar/rcar_canfd.c

+11 −10
Original line number Diff line number Diff line
@@ -1484,7 +1484,9 @@ 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) {

	if (!(priv->can.ctrlmode & CAN_CTRLMODE_FD))

		return;



	/* Data bit timing settings */

	brp = dbt->brp - 1;

	sjw = dbt->sjw - 1;
@@ -1496,7 +1498,6 @@ static void rcar_canfd_set_bittiming(struct net_device *ndev) 


	rcar_canfd_write(priv->base, rcar_canfd_f_dcfg(gpriv, ch), cfg);

}

}



static int rcar_canfd_start(struct net_device *ndev)

{