OSDN Git Service

can: kvaser_usb: Rename define USB_HYBRID_{,PRO_}CANLIN_PRODUCT_ID
authorJimmy Assarsson <extja@kvaser.com>
Thu, 29 Apr 2021 09:37:29 +0000 (11:37 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 27 May 2021 07:42:22 +0000 (09:42 +0200)
Rename define USB_HYBRID_{,PRO_}CANLIN_PRODUCT_ID to
USB_HYBRID_{,PRO_}2CANLIN_PRODUCT_ID, to reflect the channel count.

Link: https://lore.kernel.org/r/20210429093730.499263-1-extja@kvaser.com
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

index 90ebcae..b2236bf 100644 (file)
 #define USB_USBCAN_PRO_2HS_V2_PRODUCT_ID       264
 #define USB_MEMO_2HS_PRODUCT_ID                        265
 #define USB_MEMO_PRO_2HS_V2_PRODUCT_ID         266
-#define USB_HYBRID_CANLIN_PRODUCT_ID           267
+#define USB_HYBRID_2CANLIN_PRODUCT_ID          267
 #define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID   268
 #define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID     269
-#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID       270
+#define USB_HYBRID_PRO_2CANLIN_PRODUCT_ID      270
 #define USB_U100_PRODUCT_ID                    273
 #define USB_U100P_PRODUCT_ID                   274
 #define USB_U100S_PRODUCT_ID                   275
@@ -187,10 +187,10 @@ static const struct usb_device_id kvaser_usb_table[] = {
        { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID) },
-       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },
+       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_2CANLIN_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },
-       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },
+       { USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_2CANLIN_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_U100_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_U100P_PRODUCT_ID) },
        { USB_DEVICE(KVASER_VENDOR_ID, USB_U100S_PRODUCT_ID) },