media: cxusb: use the newer dvb-usb macros for USB device

In order to make the drivers under dvb-usb more homogeneous,
use the new macro.

Link: https://lore.kernel.org/linux-media/bd1e61664e234252de3dfac16aab8bfc35b7bcd7.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 265b960db4995d7b5d7ab724eae03f5283ae260b..1d98d3465e28d4020d126169c155b2de8c880269 100644 (file)
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -1692,72 +1692,30 @@ static void cxusb_disconnect(struct usb_interface *intf)
        dvb_usb_device_exit(intf);
 }
 
-static struct usb_device_id cxusb_table[NR__cxusb_table_index + 1] = {
-       [MEDION_MD95700] = {
-               USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700)
-       },
-       [DVICO_BLUEBIRD_LG064F_COLD] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD)
-       },
-       [DVICO_BLUEBIRD_LG064F_WARM] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM)
-       },
-       [DVICO_BLUEBIRD_DUAL_1_COLD] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD)
-       },
-       [DVICO_BLUEBIRD_DUAL_1_WARM] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM)
-       },
-       [DVICO_BLUEBIRD_LGZ201_COLD] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD)
-       },
-       [DVICO_BLUEBIRD_LGZ201_WARM] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM)
-       },
-       [DVICO_BLUEBIRD_TH7579_COLD] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD)
-       },
-       [DVICO_BLUEBIRD_TH7579_WARM] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM)
-       },
-       [DIGITALNOW_BLUEBIRD_DUAL_1_COLD] = {
-               USB_DEVICE(USB_VID_DVICO,
-                          USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD)
-       },
-       [DIGITALNOW_BLUEBIRD_DUAL_1_WARM] = {
-               USB_DEVICE(USB_VID_DVICO,
-                          USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM)
-       },
-       [DVICO_BLUEBIRD_DUAL_2_COLD] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD)
-       },
-       [DVICO_BLUEBIRD_DUAL_2_WARM] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM)
-       },
-       [DVICO_BLUEBIRD_DUAL_4] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4)
-       },
-       [DVICO_BLUEBIRD_DVB_T_NANO_2] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2)
-       },
-       [DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM] = {
-               USB_DEVICE(USB_VID_DVICO,
-                          USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM)
-       },
-       [AVERMEDIA_VOLAR_A868R] = {
-               USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_A868R)
-       },
-       [DVICO_BLUEBIRD_DUAL_4_REV_2] = {
-               USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2)
-       },
-       [CONEXANT_D680_DMB] = {
-               USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB)
-       },
-       [MYGICA_D689] = {
-               USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_D689)
-       },
-       {}              /* Terminating entry */
+static struct usb_device_id cxusb_table[] = {
+       DVB_USB_DEV(MEDION, MEDION_MD95700),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LG064F_COLD),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LG064F_WARM),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_1_COLD),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_1_WARM),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LGZ201_COLD),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_LGZ201_WARM),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_TH7579_COLD),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_TH7579_WARM),
+       DVB_USB_DEV(DVICO, DIGITALNOW_BLUEBIRD_DUAL_1_COLD),
+       DVB_USB_DEV(DVICO, DIGITALNOW_BLUEBIRD_DUAL_1_WARM),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_2_COLD),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_2_WARM),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_4),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DVB_T_NANO_2),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM),
+       DVB_USB_DEV(AVERMEDIA, AVERMEDIA_VOLAR_A868R),
+       DVB_USB_DEV(DVICO, DVICO_BLUEBIRD_DUAL_4_REV_2),
+       DVB_USB_DEV(CONEXANT, CONEXANT_D680_DMB),
+       DVB_USB_DEV(CONEXANT, MYGICA_D689),
+       { }
 };
+
 MODULE_DEVICE_TABLE(usb, cxusb_table);
 
 static struct dvb_usb_device_properties cxusb_medion_properties = {