staging: line6: Cleanup device table

Wrap USB_DEVICE to avoid repeating the Line 6 vendor ID.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index e40400b842a05274817362835381d7bcbf4cb717..a263bce95414aa807dd48338c7aec0baa5b2d422 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -30,27 +30,29 @@
 #define DRIVER_DESC    "Line6 USB Driver"
 #define DRIVER_VERSION "0.9.1beta" DRIVER_REVISION
 
+#define LINE6_DEVICE(prod) USB_DEVICE(LINE6_VENDOR_ID, prod)
+
 /* table of devices that work with this driver */
 static const struct usb_device_id line6_id_table[] = {
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_BASSPODXT)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_BASSPODXTLIVE)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_BASSPODXTPRO)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX2)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXT)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXTLIVE)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODXTPRO)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_TONEPORT_GX)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_TONEPORT_UX1)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_TONEPORT_UX2)},
-       {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_VARIAX)},
-       {},
+       { LINE6_DEVICE(LINE6_DEVID_BASSPODXT) },
+       { LINE6_DEVICE(LINE6_DEVID_BASSPODXTLIVE) },
+       { LINE6_DEVICE(LINE6_DEVID_BASSPODXTPRO) },
+       { LINE6_DEVICE(LINE6_DEVID_GUITARPORT) },
+       { LINE6_DEVICE(LINE6_DEVID_POCKETPOD) },
+       { LINE6_DEVICE(LINE6_DEVID_PODHD300) },
+       { LINE6_DEVICE(LINE6_DEVID_PODHD400) },
+       { LINE6_DEVICE(LINE6_DEVID_PODHD500) },
+       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_GX) },
+       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX1) },
+       { LINE6_DEVICE(LINE6_DEVID_PODSTUDIO_UX2) },
+       { LINE6_DEVICE(LINE6_DEVID_PODXT) },
+       { LINE6_DEVICE(LINE6_DEVID_PODXTLIVE) },
+       { LINE6_DEVICE(LINE6_DEVID_PODXTPRO) },
+       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_GX) },
+       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX1) },
+       { LINE6_DEVICE(LINE6_DEVID_TONEPORT_UX2) },
+       { LINE6_DEVICE(LINE6_DEVID_VARIAX) },
+       {}
 };
 
 MODULE_DEVICE_TABLE(usb, line6_id_table);