Commit f6adf410 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde

can: gs_usb: gs_can_open(): sort checks for ctrlmode

Sort the checks for dev->can.ctrlmode by values of CAN_CTRLMODE_*, so
that it's clear where to add new checks.

While there, remove the comment that the Atmel UC3C hardware doesn't
support One Shot Mode. The One Shot mode is only available and to be
activated by the user, if the device specifies the feature bit
GS_CAN_FEATURE_ONE_SHOT.

Link: https://lore.kernel.org/all/20221019221016.1659260-3-mkl@pengutronix.deSigned-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent deb8534e
...@@ -843,8 +843,6 @@ static int gs_can_open(struct net_device *netdev) ...@@ -843,8 +843,6 @@ static int gs_can_open(struct net_device *netdev)
ctrlmode = dev->can.ctrlmode; ctrlmode = dev->can.ctrlmode;
if (ctrlmode & CAN_CTRLMODE_FD) { if (ctrlmode & CAN_CTRLMODE_FD) {
flags |= GS_CAN_MODE_FD;
if (dev->feature & GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX) if (dev->feature & GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX)
dev->hf_size_tx = struct_size(hf, canfd_quirk, 1); dev->hf_size_tx = struct_size(hf, canfd_quirk, 1);
else else
...@@ -915,14 +913,14 @@ static int gs_can_open(struct net_device *netdev) ...@@ -915,14 +913,14 @@ static int gs_can_open(struct net_device *netdev)
if (ctrlmode & CAN_CTRLMODE_LISTENONLY) if (ctrlmode & CAN_CTRLMODE_LISTENONLY)
flags |= GS_CAN_MODE_LISTEN_ONLY; flags |= GS_CAN_MODE_LISTEN_ONLY;
/* Controller is not allowed to retry TX if (ctrlmode & CAN_CTRLMODE_3_SAMPLES)
* this mode is unavailable on atmels uc3c hardware flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
*/
if (ctrlmode & CAN_CTRLMODE_ONE_SHOT) if (ctrlmode & CAN_CTRLMODE_ONE_SHOT)
flags |= GS_CAN_MODE_ONE_SHOT; flags |= GS_CAN_MODE_ONE_SHOT;
if (ctrlmode & CAN_CTRLMODE_3_SAMPLES) if (ctrlmode & CAN_CTRLMODE_FD)
flags |= GS_CAN_MODE_TRIPLE_SAMPLE; flags |= GS_CAN_MODE_FD;
/* if hardware supports timestamps, enable it */ /* if hardware supports timestamps, enable it */
if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment