media: af9005: 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/9b1749763465815af92f0a4d8f210fe170c549d5.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
index b6a2436d16e97434a886eb10a822931c6df0d7b7..0827bf3d4e8c7f3bd17ab236de4301246b0c0347 100644 (file)
--- a/drivers/media/usb/dvb-usb/af9005.c
+++ b/drivers/media/usb/dvb-usb/af9005.c
@@ -994,19 +994,16 @@ static int af9005_usb_probe(struct usb_interface *intf,
                                  THIS_MODULE, NULL, adapter_nr);
 }
 
-enum af9005_usb_table_entry {
+enum {
        AFATECH_AF9005,
-       TERRATEC_AF9005,
-       ANSONIC_AF9005,
+       TERRATEC_CINERGY_T_USB_XE,
+       ANSONIC_DVBT_USB,
 };
 
 static struct usb_device_id af9005_usb_table[] = {
-       [AFATECH_AF9005] = {USB_DEVICE(USB_VID_AFATECH,
-                               USB_PID_AFATECH_AF9005)},
-       [TERRATEC_AF9005] = {USB_DEVICE(USB_VID_TERRATEC,
-                               USB_PID_TERRATEC_CINERGY_T_USB_XE)},
-       [ANSONIC_AF9005] = {USB_DEVICE(USB_VID_ANSONIC,
-                               USB_PID_ANSONIC_DVBT_USB)},
+       DVB_USB_DEV(AFATECH, AFATECH_AF9005),
+       DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T_USB_XE),
+       DVB_USB_DEV(ANSONIC, ANSONIC_DVBT_USB),
        { }
 };
 
@@ -1071,11 +1068,11 @@ static struct dvb_usb_device_properties af9005_properties = {
                     .warm_ids = {NULL},
                     },
                    {.name = "TerraTec Cinergy T USB XE",
-                    .cold_ids = {&af9005_usb_table[TERRATEC_AF9005], NULL},
+                    .cold_ids = {&af9005_usb_table[TERRATEC_CINERGY_T_USB_XE], NULL},
                     .warm_ids = {NULL},
                     },
                    {.name = "Ansonic DVB-T USB1.1 stick",
-                    .cold_ids = {&af9005_usb_table[ANSONIC_AF9005], NULL},
+                    .cold_ids = {&af9005_usb_table[ANSONIC_DVBT_USB], NULL},
                     .warm_ids = {NULL},
                     },
                    {NULL},