From: Marc Kleine-Budde Date: Thu, 29 Sep 2022 08:02:06 +0000 (+0200) Subject: can: gs_usb: gs_can_open(): merge setting of timestamp flags and init X-Git-Tag: v6.2-rc1~99^2~369^2~4^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac3f25824e4f9be1b36cc8f20572fa32b3079f94;p=thirdparty%2Fkernel%2Flinux.git can: gs_usb: gs_can_open(): merge setting of timestamp flags and init Merge the bodies of 2 consecutive "if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)" statements. Link: https://lore.kernel.org/all/20221019221016.1659260-4-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 5dad0ebb3d3e0..f9e2b394c71e4 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -923,12 +923,12 @@ static int gs_can_open(struct net_device *netdev) flags |= GS_CAN_MODE_FD; /* if hardware supports timestamps, enable it */ - if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) + if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) { flags |= GS_CAN_MODE_HW_TIMESTAMP; - /* start polling timestamp */ - if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) + /* start polling timestamp */ gs_usb_timestamp_init(dev); + } /* finally start device */ dev->can.state = CAN_STATE_ERROR_ACTIVE;