diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-28 22:41:33 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-04-04 23:06:00 +0200 |
| commit | 4974251651ec7fb087bfdcd2e52d6a9e96318b39 (patch) | |
| tree | 87622336356a238cc2880a6b0be1368d75b9a81d | |
| parent | 06f053bcdcb1129d2166483751098e1a6ade5b6b (diff) | |
media: dvb-usb: umt-010: 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/5fd3c469faa115856f48037019e607edcb41d458.1648499509.git.mchehab@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
| -rw-r--r-- | drivers/media/usb/dvb-usb/umt-010.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/media/usb/dvb-usb/umt-010.c b/drivers/media/usb/dvb-usb/umt-010.c index 2181993771ae..464699b0b75b 100644 --- a/drivers/media/usb/dvb-usb/umt-010.c +++ b/drivers/media/usb/dvb-usb/umt-010.c @@ -81,11 +81,17 @@ static int umt_probe(struct usb_interface *intf, } /* do not change the order of the ID table */ -static struct usb_device_id umt_table [] = { -/* 00 */ { USB_DEVICE(USB_VID_HANFTEK, USB_PID_HANFTEK_UMT_010_COLD) }, -/* 01 */ { USB_DEVICE(USB_VID_HANFTEK, USB_PID_HANFTEK_UMT_010_WARM) }, - { } /* Terminating entry */ +enum { + HANFTEK_UMT_010_COLD, + HANFTEK_UMT_010_WARM, }; + +static struct usb_device_id umt_table[] = { + DVB_USB_DEV(HANFTEK, HANFTEK_UMT_010_COLD), + DVB_USB_DEV(HANFTEK, HANFTEK_UMT_010_WARM), + { } +}; + MODULE_DEVICE_TABLE (usb, umt_table); static struct dvb_usb_device_properties umt_properties = { @@ -127,8 +133,8 @@ static struct dvb_usb_device_properties umt_properties = { .num_device_descs = 1, .devices = { { "Hanftek UMT-010 DVB-T USB2.0", - { &umt_table[0], NULL }, - { &umt_table[1], NULL }, + { &umt_table[HANFTEK_UMT_010_COLD], NULL }, + { &umt_table[HANFTEK_UMT_010_WARM], NULL }, }, } }; |