From ff9b0c51d88619ee9e123fce87b8a931bc484d93 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 28 Mar 2022 22:41:31 +0200 Subject: [PATCH] media: technisat-usb2: use the newer dvb-usb macros for USB device In order to make the drivers under dvb-usb more homogeneous, use the new macro. Link: https://lore.kernel.org/linux-media/c125c28aeb3d4344b632e1f99d81c433917f2a4c.1648499509.git.mchehab@kernel.org Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/dvb-usb/technisat-usb2.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c index a9ed26ce1be6..9c77911fcad4 100644 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c @@ -689,10 +689,15 @@ static int technisat_usb2_rc_query(struct dvb_usb_device *d) } /* DVB-USB and USB stuff follows */ -static struct usb_device_id technisat_usb2_id_table[] = { - { USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_DVB_S2) }, - { 0 } /* Terminating entry */ +enum { + TECHNISAT_USB2_DVB_S2, }; + +static struct usb_device_id technisat_usb2_id_table[] = { + DVB_USB_DEV(TECHNISAT, TECHNISAT_USB2_DVB_S2), + { } +}; + MODULE_DEVICE_TABLE(usb, technisat_usb2_id_table); /* device description */ @@ -738,7 +743,7 @@ static struct dvb_usb_device_properties technisat_usb2_devices = { .num_device_descs = 1, .devices = { { "Technisat SkyStar USB HD (DVB-S/S2)", - { &technisat_usb2_id_table[0], NULL }, + { &technisat_usb2_id_table[TECHNISAT_USB2_DVB_S2], NULL }, { NULL }, }, },