media: cinergyT2-core: use the newer dvb-usb macros for USB device

In order to make the drivers under dvb-usb more homogeneous,
use the new macro and an enum with the USB model supported by
this driver.

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

diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
index 405b0c9a792c4b46361833ac2eac369ea0c86924..4926c954e29a296da4f29a8593d67c7eaba1d2ae 100644 (file)
--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
@@ -193,9 +193,13 @@ static int cinergyt2_usb_probe(struct usb_interface *intf,
                                   THIS_MODULE, NULL, adapter_nr);
 }
 
+enum {
+       TERRATEC_CINERGY_T2,
+};
+
 static struct usb_device_id cinergyt2_usb_table[] = {
-       { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T2) },
-       { 0 }
+       DVB_USB_DEV(TERRATEC, TERRATEC_CINERGY_T2),
+       { }
 };
 
 MODULE_DEVICE_TABLE(usb, cinergyt2_usb_table);
@@ -240,7 +244,7 @@ static const struct dvb_usb_device_properties cinergyt2_properties = {
        .devices = {
                { .name = "TerraTec/qanu USB2.0 Highspeed DVB-T Receiver",
                  .cold_ids = {NULL},
-                 .warm_ids = { &cinergyt2_usb_table[0], NULL },
+                 .warm_ids = { &cinergyt2_usb_table[TERRATEC_CINERGY_T2], NULL },
                },
                { NULL },
        }