media: dvb-usb: ttusb2: 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/b447d9fd3832da5eff6267e8fe742c431f1133f2.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
index 294274fd8f55543cc7db101b6dd3fdf289040227..373ffa7f641e4ff8aa66617c9768cded16636fa7 100644 (file)
--- a/drivers/media/usb/dvb-usb/ttusb2.c
+++ b/drivers/media/usb/dvb-usb/ttusb2.c
@@ -630,17 +630,23 @@ static int ttusb2_probe(struct usb_interface *intf,
        return -ENODEV;
 }
 
-static struct usb_device_id ttusb2_table [] = {
-       { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_400E) },
-       { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) },
-       { USB_DEVICE(USB_VID_TECHNOTREND,
-               USB_PID_TECHNOTREND_CONNECT_S2400) },
-       { USB_DEVICE(USB_VID_TECHNOTREND,
-               USB_PID_TECHNOTREND_CONNECT_CT3650) },
-       { USB_DEVICE(USB_VID_TECHNOTREND,
-               USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM) },
-       {}              /* Terminating entry */
+enum {
+       PINNACLE_PCTV_400E,
+       PINNACLE_PCTV_450E,
+       TECHNOTREND_CONNECT_S2400,
+       TECHNOTREND_CONNECT_CT3650,
+       TECHNOTREND_CONNECT_S2400_8KEEPROM,
+};
+
+static struct usb_device_id ttusb2_table[] = {
+       DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_400E),
+       DVB_USB_DEV(PINNACLE, PINNACLE_PCTV_450E),
+       DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2400),
+       DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_CT3650),
+       DVB_USB_DEV(TECHNOTREND, TECHNOTREND_CONNECT_S2400_8KEEPROM),
+       { }
 };
+
 MODULE_DEVICE_TABLE (usb, ttusb2_table);
 
 static struct dvb_usb_device_properties ttusb2_properties = {
@@ -688,11 +694,11 @@ static struct dvb_usb_device_properties ttusb2_properties = {
        .num_device_descs = 2,
        .devices = {
                {   "Pinnacle 400e DVB-S USB2.0",
-                       { &ttusb2_table[0], NULL },
+                       { &ttusb2_table[PINNACLE_PCTV_400E], NULL },
                        { NULL },
                },
                {   "Pinnacle 450e DVB-S USB2.0",
-                       { &ttusb2_table[1], NULL },
+                       { &ttusb2_table[PINNACLE_PCTV_450E], NULL },
                        { NULL },
                },
        }
@@ -743,11 +749,11 @@ static struct dvb_usb_device_properties ttusb2_properties_s2400 = {
        .num_device_descs = 2,
        .devices = {
                {   "Technotrend TT-connect S-2400",
-                       { &ttusb2_table[2], NULL },
+                       { &ttusb2_table[TECHNOTREND_CONNECT_S2400], NULL },
                        { NULL },
                },
                {   "Technotrend TT-connect S-2400 (8kB EEPROM)",
-                       { &ttusb2_table[4], NULL },
+                       { &ttusb2_table[TECHNOTREND_CONNECT_S2400_8KEEPROM], NULL },
                        { NULL },
                },
        }
@@ -823,7 +829,7 @@ static struct dvb_usb_device_properties ttusb2_properties_ct3650 = {
        .num_device_descs = 1,
        .devices = {
                {   "Technotrend TT-connect CT-3650",
-                       .warm_ids = { &ttusb2_table[3], NULL },
+                       .warm_ids = { &ttusb2_table[TECHNOTREND_CONNECT_CT3650], NULL },
                },
        }
 };

diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h
index ed6e37f23cbc20ca8155ff765f0fdd6045284178..0fad68bfe6f9cd5c95c76fdb61a9a3bec20ad249 100644 (file)
--- a/include/media/dvb-usb-ids.h
+++ b/include/media/dvb-usb-ids.h
@@ -312,8 +312,6 @@
 #define USB_PID_PCTV_2002E                             0x025c
 #define USB_PID_PCTV_2002E_SE                          0x025d
 #define USB_PID_PCTV_200E                              0x020e
-#define USB_PID_PCTV_400E                              0x020f
-#define USB_PID_PCTV_450E                              0x0222
 #define USB_PID_PCTV_78E                               0x025a
 #define USB_PID_PCTV_79E                               0x0262
 #define USB_PID_PINNACLE_EXPRESSCARD_320CX             0x022e
@@ -329,6 +327,8 @@
 #define USB_PID_PINNACLE_PCTV74E                       0x0246
 #define USB_PID_PINNACLE_PCTV801E                      0x023a
 #define USB_PID_PINNACLE_PCTV801E_SE                   0x023b
+#define USB_PID_PINNACLE_PCTV_400E                     0x020f
+#define USB_PID_PINNACLE_PCTV_450E                     0x0222
 #define USB_PID_PINNACLE_PCTV_452E                     0x021f
 #define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T     0x0229
 #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH              0x0228