forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
....@@ -79,104 +79,134 @@
7979 #define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID	269
8080 #define USB_HYBRID_PRO_CANLIN_PRODUCT_ID	270
8181 
82
-static inline bool kvaser_is_leaf(const struct usb_device_id *id)
83
-{
84
-	return (id->idProduct >= USB_LEAF_DEVEL_PRODUCT_ID &&
85
-		id->idProduct <= USB_CAN_R_PRODUCT_ID) ||
86
-		(id->idProduct >= USB_LEAF_LITE_V2_PRODUCT_ID &&
87
-		 id->idProduct <= USB_MINI_PCIE_2HS_PRODUCT_ID);
88
-}
82
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {
83
+	.quirks = 0,
84
+	.ops = &kvaser_usb_hydra_dev_ops,
85
+};
8986 
90
-static inline bool kvaser_is_usbcan(const struct usb_device_id *id)
91
-{
92
-	return id->idProduct >= USB_USBCAN_REVB_PRODUCT_ID &&
93
-	       id->idProduct <= USB_MEMORATOR_PRODUCT_ID;
94
-}
87
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_usbcan = {
88
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
89
+		  KVASER_USB_QUIRK_HAS_SILENT_MODE,
90
+	.family = KVASER_USBCAN,
91
+	.ops = &kvaser_usb_leaf_dev_ops,
92
+};
9593 
96
-static inline bool kvaser_is_hydra(const struct usb_device_id *id)
97
-{
98
-	return id->idProduct >= USB_BLACKBIRD_V2_PRODUCT_ID &&
99
-	       id->idProduct <= USB_HYBRID_PRO_CANLIN_PRODUCT_ID;
100
-}
94
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf = {
95
+	.quirks = KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
96
+	.family = KVASER_LEAF,
97
+	.ops = &kvaser_usb_leaf_dev_ops,
98
+};
99
+
100
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = {
101
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
102
+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
103
+	.family = KVASER_LEAF,
104
+	.ops = &kvaser_usb_leaf_dev_ops,
105
+};
106
+
107
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err_listen = {
108
+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |
109
+		  KVASER_USB_QUIRK_HAS_SILENT_MODE |
110
+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,
111
+	.family = KVASER_LEAF,
112
+	.ops = &kvaser_usb_leaf_dev_ops,
113
+};
114
+
115
+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = {
116
+	.quirks = 0,
117
+	.ops = &kvaser_usb_leaf_dev_ops,
118
+};
101119 
102120 static const struct usb_device_id kvaser_usb_table[] = {
103
-	/* Leaf USB product IDs */
104
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) },
105
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID) },
121
+	/* Leaf M32C USB product IDs */
122
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID),
123
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
124
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID),
125
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
106126 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_PRODUCT_ID),
107
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
108
-			       KVASER_USB_HAS_SILENT_MODE },
127
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
109128 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_PRODUCT_ID),
110
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
111
-			       KVASER_USB_HAS_SILENT_MODE },
129
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
112130 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LS_PRODUCT_ID),
113
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
114
-			       KVASER_USB_HAS_SILENT_MODE },
131
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
115132 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_SWC_PRODUCT_ID),
116
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
117
-			       KVASER_USB_HAS_SILENT_MODE },
133
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
118134 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LIN_PRODUCT_ID),
119
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
120
-			       KVASER_USB_HAS_SILENT_MODE },
135
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
121136 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_LS_PRODUCT_ID),
122
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
123
-			       KVASER_USB_HAS_SILENT_MODE },
137
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
124138 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_SWC_PRODUCT_ID),
125
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
126
-			       KVASER_USB_HAS_SILENT_MODE },
139
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
127140 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_DEVEL_PRODUCT_ID),
128
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
129
-			       KVASER_USB_HAS_SILENT_MODE },
141
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
130142 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSHS_PRODUCT_ID),
131
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
132
-			       KVASER_USB_HAS_SILENT_MODE },
143
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
133144 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_UPRO_HSHS_PRODUCT_ID),
134
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
135
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID) },
145
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
146
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID),
147
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf },
136148 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_OBDII_PRODUCT_ID),
137
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |
138
-			       KVASER_USB_HAS_SILENT_MODE },
149
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err_listen },
139150 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSLS_PRODUCT_ID),
140
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
151
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
141152 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_CH_PRODUCT_ID),
142
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
153
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
143154 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_SPRO_PRODUCT_ID),
144
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
155
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
145156 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_MERCURY_PRODUCT_ID),
146
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
157
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
147158 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_LEAF_PRODUCT_ID),
148
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
159
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
149160 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID),
150
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
151
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },
152
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },
153
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },
154
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },
155
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },
161
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err },
162
+
163
+	/* Leaf i.MX28 USB product IDs */
164
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID),
165
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
166
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID),
167
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
168
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID),
169
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
170
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID),
171
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
172
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID),
173
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },
156174 
157175 	/* USBCANII USB product IDs */
158176 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
159
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
177
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
160178 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_REVB_PRODUCT_ID),
161
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
179
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
162180 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMORATOR_PRODUCT_ID),
163
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
181
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
164182 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_VCI2_PRODUCT_ID),
165
-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },
183
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_usbcan },
166184 
167185 	/* Minihydra USB product IDs */
168
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID) },
169
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID) },
170
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID) },
171
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID) },
172
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID) },
173
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
174
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID) },
175
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID) },
176
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },
177
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
178
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },
179
-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },
186
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID),
187
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
188
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID),
189
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
190
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID),
191
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
192
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID),
193
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
194
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID),
195
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
196
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID),
197
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
198
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID),
199
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
200
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID),
201
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
202
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID),
203
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
204
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID),
205
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
206
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID),
207
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
208
+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID),
209
+		.driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_hydra },
180210 	{ }
181211 };
182212 MODULE_DEVICE_TABLE(usb, kvaser_usb_table);
....@@ -267,6 +297,7 @@
267297 static void kvaser_usb_read_bulk_callback(struct urb *urb)
268298 {
269299 	struct kvaser_usb *dev = urb->context;
300
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
270301 	int err;
271302 	unsigned int i;
272303 
....@@ -283,8 +314,8 @@
283314 		goto resubmit_urb;
284315 	}
285316 
286
-	dev->ops->dev_read_bulk_callback(dev, urb->transfer_buffer,
287
-					 urb->actual_length);
317
+	ops->dev_read_bulk_callback(dev, urb->transfer_buffer,
318
+				    urb->actual_length);
288319 
289320 resubmit_urb:
290321 	usb_fill_bulk_urb(urb, dev->udev,
....@@ -378,6 +409,7 @@
378409 {
379410 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
380411 	struct kvaser_usb *dev = priv->dev;
412
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
381413 	int err;
382414 
383415 	err = open_candev(netdev);
....@@ -388,11 +420,11 @@
388420 	if (err)
389421 		goto error;
390422 
391
-	err = dev->ops->dev_set_opt_mode(priv);
423
+	err = ops->dev_set_opt_mode(priv);
392424 	if (err)
393425 		goto error;
394426 
395
-	err = dev->ops->dev_start_chip(priv);
427
+	err = ops->dev_start_chip(priv);
396428 	if (err) {
397429 		netdev_warn(netdev, "Cannot start device, error %d\n", err);
398430 		goto error;
....@@ -421,7 +453,7 @@
421453 /* This method might sleep. Do not call it in the atomic context
422454  * of URB completions.
423455  */
424
-static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
456
+void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)
425457 {
426458 	usb_kill_anchored_urbs(&priv->tx_submitted);
427459 	kvaser_usb_reset_tx_urb_contexts(priv);
....@@ -449,22 +481,23 @@
449481 {
450482 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
451483 	struct kvaser_usb *dev = priv->dev;
484
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
452485 	int err;
453486 
454487 	netif_stop_queue(netdev);
455488 
456
-	err = dev->ops->dev_flush_queue(priv);
489
+	err = ops->dev_flush_queue(priv);
457490 	if (err)
458491 		netdev_warn(netdev, "Cannot flush queue, error %d\n", err);
459492 
460
-	if (dev->ops->dev_reset_chip) {
461
-		err = dev->ops->dev_reset_chip(dev, priv->channel);
493
+	if (ops->dev_reset_chip) {
494
+		err = ops->dev_reset_chip(dev, priv->channel);
462495 		if (err)
463496 			netdev_warn(netdev, "Cannot reset card, error %d\n",
464497 				    err);
465498 	}
466499 
467
-	err = dev->ops->dev_stop_chip(priv);
500
+	err = ops->dev_stop_chip(priv);
468501 	if (err)
469502 		netdev_warn(netdev, "Cannot stop device, error %d\n", err);
470503 
....@@ -503,6 +536,7 @@
503536 {
504537 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);
505538 	struct kvaser_usb *dev = priv->dev;
539
+	const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops;
506540 	struct net_device_stats *stats = &netdev->stats;
507541 	struct kvaser_usb_tx_urb_context *context = NULL;
508542 	struct urb *urb;
....@@ -545,8 +579,8 @@
545579 		goto freeurb;
546580 	}
547581 
548
-	buf = dev->ops->dev_frame_to_cmd(priv, skb, &context->dlc, &cmd_len,
549
-					 context->echo_index);
582
+	buf = ops->dev_frame_to_cmd(priv, skb, &context->dlc, &cmd_len,
583
+				    context->echo_index);
550584 	if (!buf) {
551585 		stats->tx_dropped++;
552586 		dev_kfree_skb(skb);
....@@ -630,21 +664,21 @@
630664 	}
631665 }
632666 
633
-static int kvaser_usb_init_one(struct kvaser_usb *dev,
634
-			       const struct usb_device_id *id, int channel)
667
+static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)
635668 {
636669 	struct net_device *netdev;
637670 	struct kvaser_usb_net_priv *priv;
671
+	const struct kvaser_usb_driver_info *driver_info = dev->driver_info;
672
+	const struct kvaser_usb_dev_ops *ops = driver_info->ops;
638673 	int err;
639674 
640
-	if (dev->ops->dev_reset_chip) {
641
-		err = dev->ops->dev_reset_chip(dev, channel);
675
+	if (ops->dev_reset_chip) {
676
+		err = ops->dev_reset_chip(dev, channel);
642677 		if (err)
643678 			return err;
644679 	}
645680 
646
-	netdev = alloc_candev(sizeof(*priv) +
647
-			      dev->max_tx_urbs * sizeof(*priv->tx_contexts),
681
+	netdev = alloc_candev(struct_size(priv, tx_contexts, dev->max_tx_urbs),
648682 			      dev->max_tx_urbs);
649683 	if (!netdev) {
650684 		dev_err(&dev->intf->dev, "Cannot alloc candev\n");
....@@ -656,6 +690,7 @@
656690 	init_usb_anchor(&priv->tx_submitted);
657691 	init_completion(&priv->start_comp);
658692 	init_completion(&priv->stop_comp);
693
+	init_completion(&priv->flush_comp);
659694 	priv->can.ctrlmode_supported = 0;
660695 
661696 	priv->dev = dev;
....@@ -668,20 +703,19 @@
668703 	priv->can.state = CAN_STATE_STOPPED;
669704 	priv->can.clock.freq = dev->cfg->clock.freq;
670705 	priv->can.bittiming_const = dev->cfg->bittiming_const;
671
-	priv->can.do_set_bittiming = dev->ops->dev_set_bittiming;
672
-	priv->can.do_set_mode = dev->ops->dev_set_mode;
673
-	if ((id->driver_info & KVASER_USB_HAS_TXRX_ERRORS) ||
706
+	priv->can.do_set_bittiming = ops->dev_set_bittiming;
707
+	priv->can.do_set_mode = ops->dev_set_mode;
708
+	if ((driver_info->quirks & KVASER_USB_QUIRK_HAS_TXRX_ERRORS) ||
674709 	    (priv->dev->card_data.capabilities & KVASER_USB_CAP_BERR_CAP))
675
-		priv->can.do_get_berr_counter = dev->ops->dev_get_berr_counter;
676
-	if (id->driver_info & KVASER_USB_HAS_SILENT_MODE)
710
+		priv->can.do_get_berr_counter = ops->dev_get_berr_counter;
711
+	if (driver_info->quirks & KVASER_USB_QUIRK_HAS_SILENT_MODE)
677712 		priv->can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;
678713 
679714 	priv->can.ctrlmode_supported |= dev->card_data.ctrlmode_supported;
680715 
681716 	if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
682717 		priv->can.data_bittiming_const = dev->cfg->data_bittiming_const;
683
-		priv->can.do_set_data_bittiming =
684
-					dev->ops->dev_set_data_bittiming;
718
+		priv->can.do_set_data_bittiming = ops->dev_set_data_bittiming;
685719 	}
686720 
687721 	netdev->flags |= IFF_ECHO;
....@@ -712,29 +746,22 @@
712746 	struct kvaser_usb *dev;
713747 	int err;
714748 	int i;
749
+	const struct kvaser_usb_driver_info *driver_info;
750
+	const struct kvaser_usb_dev_ops *ops;
751
+
752
+	driver_info = (const struct kvaser_usb_driver_info *)id->driver_info;
753
+	if (!driver_info)
754
+		return -ENODEV;
715755 
716756 	dev = devm_kzalloc(&intf->dev, sizeof(*dev), GFP_KERNEL);
717757 	if (!dev)
718758 		return -ENOMEM;
719759 
720
-	if (kvaser_is_leaf(id)) {
721
-		dev->card_data.leaf.family = KVASER_LEAF;
722
-		dev->ops = &kvaser_usb_leaf_dev_ops;
723
-	} else if (kvaser_is_usbcan(id)) {
724
-		dev->card_data.leaf.family = KVASER_USBCAN;
725
-		dev->ops = &kvaser_usb_leaf_dev_ops;
726
-	} else if (kvaser_is_hydra(id)) {
727
-		dev->ops = &kvaser_usb_hydra_dev_ops;
728
-	} else {
729
-		dev_err(&intf->dev,
730
-			"Product ID (%d) is not a supported Kvaser USB device\n",
731
-			id->idProduct);
732
-		return -ENODEV;
733
-	}
734
-
735760 	dev->intf = intf;
761
+	dev->driver_info = driver_info;
762
+	ops = driver_info->ops;
736763 
737
-	err = dev->ops->dev_setup_endpoints(dev);
764
+	err = ops->dev_setup_endpoints(dev);
738765 	if (err) {
739766 		dev_err(&intf->dev, "Cannot get usb endpoint(s)");
740767 		return err;
....@@ -748,22 +775,22 @@
748775 
749776 	dev->card_data.ctrlmode_supported = 0;
750777 	dev->card_data.capabilities = 0;
751
-	err = dev->ops->dev_init_card(dev);
778
+	err = ops->dev_init_card(dev);
752779 	if (err) {
753780 		dev_err(&intf->dev,
754781 			"Failed to initialize card, error %d\n", err);
755782 		return err;
756783 	}
757784 
758
-	err = dev->ops->dev_get_software_info(dev);
785
+	err = ops->dev_get_software_info(dev);
759786 	if (err) {
760787 		dev_err(&intf->dev,
761788 			"Cannot get software info, error %d\n", err);
762789 		return err;
763790 	}
764791 
765
-	if (dev->ops->dev_get_software_details) {
766
-		err = dev->ops->dev_get_software_details(dev);
792
+	if (ops->dev_get_software_details) {
793
+		err = ops->dev_get_software_details(dev);
767794 		if (err) {
768795 			dev_err(&intf->dev,
769796 				"Cannot get software details, error %d\n", err);
....@@ -781,14 +808,14 @@
781808 
782809 	dev_dbg(&intf->dev, "Max outstanding tx = %d URBs\n", dev->max_tx_urbs);
783810 
784
-	err = dev->ops->dev_get_card_info(dev);
811
+	err = ops->dev_get_card_info(dev);
785812 	if (err) {
786813 		dev_err(&intf->dev, "Cannot get card info, error %d\n", err);
787814 		return err;
788815 	}
789816 
790
-	if (dev->ops->dev_get_capabilities) {
791
-		err = dev->ops->dev_get_capabilities(dev);
817
+	if (ops->dev_get_capabilities) {
818
+		err = ops->dev_get_capabilities(dev);
792819 		if (err) {
793820 			dev_err(&intf->dev,
794821 				"Cannot get capabilities, error %d\n", err);
....@@ -798,7 +825,7 @@
798825 	}
799826 
800827 	for (i = 0; i < dev->nchannels; i++) {
801
-		err = kvaser_usb_init_one(dev, id, i);
828
+		err = kvaser_usb_init_one(dev, i);
802829 		if (err) {
803830 			kvaser_usb_remove_interfaces(dev);
804831 			return err;