staging: line6: Remove idVendor and idProduct macros

[firefly-linux-kernel-4.4.55.git] / drivers / staging / line6 / driver.c

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 81d5a27421cb2c8daad6a635ac82d1c2be12928e..6dc8a0d4c4b6ce4c4cda9f8e6c779ead682c3136 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -30,46 +30,28 @@
 #define DRIVER_DESC    "Line6 USB Driver"
 #define DRIVER_VERSION "0.9.1beta" DRIVER_REVISION
 
-#define LINE6_DEVICE(prod) USB_DEVICE(LINE6_VENDOR_ID, prod)
+#define LINE6_DEVICE(prod) USB_DEVICE(0x0e41, prod)
 
 /* table of devices that work with this driver */
 static const struct usb_device_id line6_id_table[] = {
-       { LINE6_DEVICE(LINE6_DEVID_BASSPODXT),
-               .driver_info = LINE6_BASSPODXT },
-       { LINE6_DEVICE(LINE6_DEVID_BASSPODXTLIVE),
-               .driver_info = LINE6_BASSPODXTLIVE },
-       { LINE6_DEVICE(LINE6_DEVID_BASSPODXTPRO),
-               .driver_info = LINE6_BASSPODXTPRO },
-       { LINE6_DEVICE(LINE6_DEVID_GUITARPORT),
-               .driver_info = LINE6_GUITARPORT },
-       { LINE6_DEVICE(LINE6_DEVID_POCKETPOD),
-               .driver_info = LINE6_POCKETPOD },
-       { LINE6_DEVICE(LINE6_DEVID_PODHD300),
-               .driver_info = LINE6_PODHD300 },
-       { LINE6_DEVICE(LINE6_DEVID_PODHD400),
-               .driver_info = LINE6_PODHD400 },
-       { LINE6_DEVICE(LINE6_DEVID_PODHD500),
-               .driver_info = LINE6_PODHD500 },
-       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_GX),
-               .driver_info = LINE6_PODSTUDIO_GX },
-       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX1),
-               .driver_info = LINE6_PODSTUDIO_UX1 },
-       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX2),
-               .driver_info = LINE6_PODSTUDIO_UX2 },
-       { LINE6_DEVICE(LINE6_DEVID_PODXT),
-               .driver_info = LINE6_PODXT },
-       { LINE6_DEVICE(LINE6_DEVID_PODXTLIVE),
-               .driver_info = LINE6_PODXTLIVE },
-       { LINE6_DEVICE(LINE6_DEVID_PODXTPRO),
-               .driver_info = LINE6_PODXTPRO },
-       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_GX),
-               .driver_info = LINE6_TONEPORT_GX },
-       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX1),
-               .driver_info = LINE6_TONEPORT_UX1 },
-       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX2),
-               .driver_info = LINE6_TONEPORT_UX2 },
-       { LINE6_DEVICE(LINE6_DEVID_VARIAX),
-               .driver_info = LINE6_VARIAX },
+       { LINE6_DEVICE(0x4250),    .driver_info = LINE6_BASSPODXT },
+       { LINE6_DEVICE(0x4642),    .driver_info = LINE6_BASSPODXTLIVE },
+       { LINE6_DEVICE(0x4252),    .driver_info = LINE6_BASSPODXTPRO },
+       { LINE6_DEVICE(0x4750),    .driver_info = LINE6_GUITARPORT },
+       { LINE6_DEVICE(0x5051),    .driver_info = LINE6_POCKETPOD },
+       { LINE6_DEVICE(0x5057),    .driver_info = LINE6_PODHD300 },
+       { LINE6_DEVICE(0x5058),    .driver_info = LINE6_PODHD400 },
+       { LINE6_DEVICE(0x414D),    .driver_info = LINE6_PODHD500 },
+       { LINE6_DEVICE(0x4153),    .driver_info = LINE6_PODSTUDIO_GX },
+       { LINE6_DEVICE(0x4150),    .driver_info = LINE6_PODSTUDIO_UX1 },
+       { LINE6_DEVICE(0x4151),    .driver_info = LINE6_PODSTUDIO_UX2 },
+       { LINE6_DEVICE(0x5044),    .driver_info = LINE6_PODXT },
+       { LINE6_DEVICE(0x4650),    .driver_info = LINE6_PODXTLIVE },
+       { LINE6_DEVICE(0x5050),    .driver_info = LINE6_PODXTPRO },
+       { LINE6_DEVICE(0x4147),    .driver_info = LINE6_TONEPORT_GX },
+       { LINE6_DEVICE(0x4141),    .driver_info = LINE6_TONEPORT_UX1 },
+       { LINE6_DEVICE(0x4142),    .driver_info = LINE6_TONEPORT_UX2 },
+       { LINE6_DEVICE(0x534d),    .driver_info = LINE6_VARIAX },
        {}
 };