Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / media / dvb / dvb-usb / af9005.c

diff --git a/drivers/media/dvb/dvb-usb/af9005.c b/drivers/media/dvb/dvb-usb/af9005.c
index 4fc024d770406bf6588b1d409aa7be1df5ab98f0..af176b6ce738e78d4dc366ae0d56597f833f4e59 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9005.c
+++ b/drivers/media/dvb/dvb-usb/af9005.c
@@ -977,11 +977,20 @@ static int af9005_usb_probe(struct usb_interface *intf,
                                   THIS_MODULE, NULL, adapter_nr);
 }
 
+enum af9005_usb_table_entry {
+       AFATECH_AF9005,
+       TERRATEC_AF9005,
+       ANSONIC_AF9005,
+};
+
 static struct usb_device_id af9005_usb_table[] = {
-       {USB_DEVICE(USB_VID_AFATECH, USB_PID_AFATECH_AF9005)},
-       {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_USB_XE)},
-       {USB_DEVICE(USB_VID_ANSONIC, USB_PID_ANSONIC_DVBT_USB)},
-       {0},
+       [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)},
+       { }
 };
 
 MODULE_DEVICE_TABLE(usb, af9005_usb_table);
@@ -1041,15 +1050,15 @@ static struct dvb_usb_device_properties af9005_properties = {
        .num_device_descs = 3,
        .devices = {
                    {.name = "Afatech DVB-T USB1.1 stick",
-                    .cold_ids = {&af9005_usb_table[0], NULL},
+                    .cold_ids = {&af9005_usb_table[AFATECH_AF9005], NULL},
                     .warm_ids = {NULL},
                     },
                    {.name = "TerraTec Cinergy T USB XE",
-                    .cold_ids = {&af9005_usb_table[1], NULL},
+                    .cold_ids = {&af9005_usb_table[TERRATEC_AF9005], NULL},
                     .warm_ids = {NULL},
                     },
                    {.name = "Ansonic DVB-T USB1.1 stick",
-                    .cold_ids = {&af9005_usb_table[2], NULL},
+                    .cold_ids = {&af9005_usb_table[ANSONIC_AF9005], NULL},
                     .warm_ids = {NULL},
                     },
                    {NULL},