Commit 51b56a25 authored by Jimmy Assarsson's avatar Jimmy Assarsson Committed by Marc Kleine-Budde
Browse files

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: default avatarJimmy Assarsson <extja@kvaser.com>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/all/20240701154936.92633-14-extja@kvaser.com


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

drivers/net/can/usb/kvaser_usb/kvaser_usb.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

+8 −18
Original line number Diff line number Diff line
@@ -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;

	}

	SET_NETDEV_DEV(netdev, &dev->intf->dev);

	netdev->dev_id = channel;