diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-28 23:41:22 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-04-18 08:36:43 +0300 |
| commit | b18869ba190dce7ac9802143253fa0a0a639d059 (patch) | |
| tree | 4e11c4cf32c261b40aeafe2e04b13e204d94b8b2 | |
| parent | 671cae46917690bfbf319b1784ed15aa876bd3c8 (diff) | |
| download | linux-b18869ba190dce7ac9802143253fa0a0a639d059.tar.xz | |
media: digitv: 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/68de8820a361e61c25bf7402acac71b3770ff906.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
| -rw-r--r-- | drivers/media/usb/dvb-usb/digitv.c | 13 | ||||
| -rw-r--r-- | include/media/dvb-usb-ids.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/usb/dvb-usb/digitv.c b/drivers/media/usb/dvb-usb/digitv.c index 4e3b3c064bcf..2756815a780b 100644 --- a/drivers/media/usb/dvb-usb/digitv.c +++ b/drivers/media/usb/dvb-usb/digitv.c @@ -291,10 +291,15 @@ static int digitv_probe(struct usb_interface *intf, return ret; } -static struct usb_device_id digitv_table [] = { - { USB_DEVICE(USB_VID_ANCHOR, USB_PID_NEBULA_DIGITV) }, - { } /* Terminating entry */ +enum { + ANCHOR_NEBULA_DIGITV, }; + +static struct usb_device_id digitv_table[] = { + DVB_USB_DEV(ANCHOR, ANCHOR_NEBULA_DIGITV), + { } +}; + MODULE_DEVICE_TABLE (usb, digitv_table); static struct dvb_usb_device_properties digitv_properties = { @@ -343,7 +348,7 @@ static struct dvb_usb_device_properties digitv_properties = { .num_device_descs = 1, .devices = { { "Nebula Electronics uDigiTV DVB-T USB2.0)", - { &digitv_table[0], NULL }, + { &digitv_table[ANCHOR_NEBULA_DIGITV], NULL }, { NULL }, }, { NULL }, diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h index 5ae55c20912e..c3bea2bf9dda 100644 --- a/include/media/dvb-usb-ids.h +++ b/include/media/dvb-usb-ids.h @@ -104,6 +104,7 @@ #define USB_PID_AFATECH_AF9035_9035 0x9035 #define USB_PID_ALINK_DTU 0xf170 #define USB_PID_AME_DTV5100 0xa232 +#define USB_PID_ANCHOR_NEBULA_DIGITV 0x0201 #define USB_PID_ANSONIC_DVBT_USB 0x6000 #define USB_PID_ANYSEE 0x861f #define USB_PID_ARTEC_T14BR 0x810f @@ -301,7 +302,6 @@ #define USB_PID_MYGICA_T230C2 0xc68a #define USB_PID_MYGICA_T230C2_LITE 0xc69a #define USB_PID_MYGICA_T230C_LITE 0xc699 -#define USB_PID_NEBULA_DIGITV 0x0201 #define USB_PID_NOXON_DAB_STICK 0x00b3 #define USB_PID_NOXON_DAB_STICK_REV2 0x00e0 #define USB_PID_NOXON_DAB_STICK_REV3 0x00b4 |