projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f6adf41
)
can: gs_usb: gs_can_open(): merge setting of timestamp flags and init
author
Marc Kleine-Budde
<mkl@pengutronix.de>
Thu, 29 Sep 2022 08:02:06 +0000
(10:02 +0200)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Thu, 20 Oct 2022 09:59:14 +0000
(11:59 +0200)
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 <mkl@pengutronix.de>
drivers/net/can/usb/gs_usb.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/usb/gs_usb.c
b/drivers/net/can/usb/gs_usb.c
index 5dad0ebb3d3e087af50290c60d40e1ba1f47925a..f9e2b394c71e4282fab3856627bf336b21672435 100644
(file)
--- 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;