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

diff --git a/drivers/media/usb/dvb-usb/gp8psk.c b/drivers/media/usb/dvb-usb/gp8psk.c
index b4f661bb56481689ce3d6ca21d303205c5f15a70..b2b27a86dfe522ddd566377aff88274d6d11bed8 100644 (file)
--- a/drivers/media/usb/dvb-usb/gp8psk.c
+++ b/drivers/media/usb/dvb-usb/gp8psk.c
@@ -310,15 +310,25 @@ static int gp8psk_usb_probe(struct usb_interface *intf,
        return ret;
 }
 
-static struct usb_device_id gp8psk_usb_table [] = {
-           { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_COLD) },
-           { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) },
-           { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) },
-           { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) },
-           { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_2) },
-/*         { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */
-           { 0 },
+enum {
+       GENPIX_8PSK_REV_1_COLD,
+       GENPIX_8PSK_REV_1_WARM,
+       GENPIX_8PSK_REV_2,
+       GENPIX_SKYWALKER_1,
+       GENPIX_SKYWALKER_2,
+       GENPIX_SKYWALKER_CW3K,
 };
+
+static struct usb_device_id gp8psk_usb_table[] = {
+       DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_1_COLD),
+       DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_1_WARM),
+       DVB_USB_DEV(GENPIX, GENPIX_8PSK_REV_2),
+       DVB_USB_DEV(GENPIX, GENPIX_SKYWALKER_1),
+       DVB_USB_DEV(GENPIX, GENPIX_SKYWALKER_2),
+       DVB_USB_DEV(GENPIX, GENPIX_SKYWALKER_CW3K),
+       { }
+};
+
 MODULE_DEVICE_TABLE(usb, gp8psk_usb_table);
 
 static struct dvb_usb_device_properties gp8psk_properties = {
@@ -355,20 +365,20 @@ static struct dvb_usb_device_properties gp8psk_properties = {
        .num_device_descs = 4,
        .devices = {
                { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver",
-                 .cold_ids = { &gp8psk_usb_table[0], NULL },
-                 .warm_ids = { &gp8psk_usb_table[1], NULL },
+                 .cold_ids = { &gp8psk_usb_table[GENPIX_8PSK_REV_1_COLD], NULL },
+                 .warm_ids = { &gp8psk_usb_table[GENPIX_8PSK_REV_1_WARM], NULL },
                },
                { .name = "Genpix 8PSK-to-USB2 Rev.2 DVB-S receiver",
                  .cold_ids = { NULL },
-                 .warm_ids = { &gp8psk_usb_table[2], NULL },
+                 .warm_ids = { &gp8psk_usb_table[GENPIX_8PSK_REV_2], NULL },
                },
                { .name = "Genpix SkyWalker-1 DVB-S receiver",
                  .cold_ids = { NULL },
-                 .warm_ids = { &gp8psk_usb_table[3], NULL },
+                 .warm_ids = { &gp8psk_usb_table[GENPIX_SKYWALKER_1], NULL },
                },
                { .name = "Genpix SkyWalker-2 DVB-S receiver",
                  .cold_ids = { NULL },
-                 .warm_ids = { &gp8psk_usb_table[4], NULL },
+                 .warm_ids = { &gp8psk_usb_table[GENPIX_SKYWALKER_2], NULL },
                },
                { NULL },
        }