media: dvb-usb: vp702x: use an enum for the device number

The device number is currently a value that needs to be the same
on two separate tables, but the code doesn't actually enforce it,
leading to errors as boards get added or removed.

Fix it by using an enum.

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

diff --git a/drivers/media/usb/dvb-usb/vp702x.c b/drivers/media/usb/dvb-usb/vp702x.c
index 8e9e3b49436772e7da5528f1c9ac642efcfb373a..5b6740cbd1d17c6e4be655beb23583481ea5e434 100644 (file)
--- a/drivers/media/usb/dvb-usb/vp702x.c
+++ b/drivers/media/usb/dvb-usb/vp702x.c
@@ -369,12 +369,19 @@ static void vp702x_usb_disconnect(struct usb_interface *intf)
        dvb_usb_device_exit(intf);
 }
 
-static struct usb_device_id vp702x_usb_table [] = {
-           { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7021_COLD) },
-//         { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7020_COLD) },
-//         { USB_DEVICE(USB_VID_VISIONPLUS, USB_PID_TWINHAN_VP7020_WARM) },
-           { 0 },
+enum {
+       VISIONPLUS_VP7021_COLD,
+       VISIONPLUS_VP7020_COLD,
+       VISIONPLUS_VP7020_WARM,
 };
+
+static struct usb_device_id vp702x_usb_table[] = {
+       DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7021_COLD),
+//     DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7020_COLD),
+//     DVB_USB_DEV(VISIONPLUS, VISIONPLUS_VP7020_WARM),
+       { }
+};
+
 MODULE_DEVICE_TABLE(usb, vp702x_usb_table);
 
 static struct dvb_usb_device_properties vp702x_properties = {
@@ -421,12 +428,12 @@ static struct dvb_usb_device_properties vp702x_properties = {
        .num_device_descs = 1,
        .devices = {
                { .name = "TwinhanDTV StarBox DVB-S USB2.0 (VP7021)",
-                 .cold_ids = { &vp702x_usb_table[0], NULL },
+                 .cold_ids = { &vp702x_usb_table[VISIONPLUS_VP7021_COLD], NULL },
                  .warm_ids = { NULL },
                },
 /*             { .name = "TwinhanDTV StarBox DVB-S USB2.0 (VP7020)",
-                 .cold_ids = { &vp702x_usb_table[1], NULL },
-                 .warm_ids = { &vp702x_usb_table[2], NULL },
+                 .cold_ids = { &vp702x_usb_table[VISIONPLUS_VP7020_COLD], NULL },
+                 .warm_ids = { &vp702x_usb_table[VISIONPLUS_VP7020_WARM], NULL },
                },
 */             { NULL },
        }

diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h
index 0fad68bfe6f9cd5c95c76fdb61a9a3bec20ad249..e022e38b6f957788f095a276d9f411c01baa1f6f 100644 (file)
--- a/include/media/dvb-usb-ids.h
+++ b/include/media/dvb-usb-ids.h
@@ -410,9 +410,6 @@
 #define USB_PID_TREKSTOR_TERRES_2_0                    0xC803
 #define USB_PID_TURBOX_DTT_2000                        0xd3a4
 #define USB_PID_TVWAY_PLUS                             0x0002
-#define USB_PID_TWINHAN_VP7020_COLD                    0x3203
-#define USB_PID_TWINHAN_VP7020_WARM                    0x3204
-#define USB_PID_TWINHAN_VP7021_COLD                    0x3207
 #define USB_PID_TWINHAN_VP7021_WARM                    0x3208
 #define USB_PID_TWINHAN_VP7041_COLD                    0x3201
 #define USB_PID_TWINHAN_VP7041_WARM                    0x3202
@@ -431,6 +428,9 @@
 #define USB_PID_UNK_HYPER_PALTEK_COLD                  0x005e
 #define USB_PID_UNK_HYPER_PALTEK_WARM                  0x005f
 #define USB_PID_VISIONPLUS_PINNACLE_PCTV310E           0x3211
+#define USB_PID_VISIONPLUS_VP7020_COLD                 0x3203
+#define USB_PID_VISIONPLUS_VP7020_WARM                 0x3204
+#define USB_PID_VISIONPLUS_VP7021_COLD                 0x3207
 #define USB_PID_WIDEVIEW_DTT200U_COLD                  0x0201
 #define USB_PID_WIDEVIEW_DTT200U_WARM                  0x0301
 #define USB_PID_WIDEVIEW_WT220U_COLD                   0x0222