can: kvaser_usb: Remove KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP

Remove KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP, since all devices got
hardware timestamp support.

Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20240701154936.92633-14-extja@kvaser.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
index 591f707d28953bffe977394a685ca23b037c514b..078496d9b7ba2a611b4764455570cc906c2e9fab 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
@@ -41,7 +41,6 @@
 #define KVASER_USB_QUIRK_HAS_SILENT_MODE       BIT(0)
 #define KVASER_USB_QUIRK_HAS_TXRX_ERRORS       BIT(1)
 #define KVASER_USB_QUIRK_IGNORE_CLK_FREQ       BIT(2)
-#define KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP        BIT(3)
 
 /* Device capabilities */
 #define KVASER_USB_CAP_BERR_CAP                        0x01

diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
index 576ddf932f47ec2b6615c5ad16882e56689c8f80..a4f32d57173af0829344bf05127683bb00708144 100644 (file)
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -94,29 +94,26 @@
 #define USB_MINI_PCIE_1XCAN_PRODUCT_ID 0x011B
 
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {
-       .quirks = KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+       .quirks = 0,
        .ops = &kvaser_usb_hydra_dev_ops,
 };
 
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_usbcan = {
        .quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
-                 KVASER_USB_QUIRK_HAS_SILENT_MODE |
-                 KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+                 KVASER_USB_QUIRK_HAS_SILENT_MODE,
        .family = KVASER_USBCAN,
        .ops = &kvaser_usb_leaf_dev_ops,
 };
 
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf = {
-       .quirks = KVASER_USB_QUIRK_IGNORE_CLK_FREQ |
-                 KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+       .quirks = KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
        .family = KVASER_LEAF,
        .ops = &kvaser_usb_leaf_dev_ops,
 };
 
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = {
        .quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
-                 KVASER_USB_QUIRK_IGNORE_CLK_FREQ |
-                 KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+                 KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
        .family = KVASER_LEAF,
        .ops = &kvaser_usb_leaf_dev_ops,
 };
@@ -124,14 +121,13 @@ static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = {
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err_listen = {
        .quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
                  KVASER_USB_QUIRK_HAS_SILENT_MODE |
-                 KVASER_USB_QUIRK_IGNORE_CLK_FREQ |
-                 KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+                 KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
        .family = KVASER_LEAF,
        .ops = &kvaser_usb_leaf_dev_ops,
 };
 
 static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = {
-       .quirks = KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP,
+       .quirks = 0,
        .family = KVASER_LEAF,
        .ops = &kvaser_usb_leaf_dev_ops,
 };
@@ -862,14 +858,8 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)
 
        netdev->flags |= IFF_ECHO;
 
-       netdev->netdev_ops = &kvaser_usb_netdev_ops;
-       if (driver_info->quirks & KVASER_USB_QUIRK_HAS_HARDWARE_TIMESTAMP) {
-               netdev->netdev_ops = &kvaser_usb_netdev_ops_hwts;
-               netdev->ethtool_ops = &kvaser_usb_ethtool_ops_hwts;
-       } else {
-               netdev->netdev_ops = &kvaser_usb_netdev_ops;
-               netdev->ethtool_ops = &kvaser_usb_ethtool_ops;
-       }
+       netdev->netdev_ops = &kvaser_usb_netdev_ops_hwts;
+       netdev->ethtool_ops = &kvaser_usb_ethtool_ops_hwts;
        SET_NETDEV_DEV(netdev, &dev->intf->dev);
        netdev->dev_id = channel;