2022-03-28 22:48:50

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: [PATCH 12/26] media: dtv5100: use the newer dvb-usb macros for USB device

In order to make the drivers under dvb-usb more homogeneous,
use the new macro.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/26] at: https://lore.kernel.org/all/[email protected]/

drivers/media/usb/dvb-usb/dtv5100.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/dtv5100.c b/drivers/media/usb/dvb-usb/dtv5100.c
index b644c1302c84..56c9d521a34a 100644
--- a/drivers/media/usb/dvb-usb/dtv5100.c
+++ b/drivers/media/usb/dvb-usb/dtv5100.c
@@ -162,10 +162,15 @@ static int dtv5100_probe(struct usb_interface *intf,
return 0;
}

+enum {
+ AME_DTV5100,
+};
+
static struct usb_device_id dtv5100_table[] = {
- { USB_DEVICE(USB_VID_AME, USB_PID_AME_DTV5100) },
- { } /* Terminating entry */
+ DVB_USB_DEV(AME, AME_DTV5100),
+ { }
};
+
MODULE_DEVICE_TABLE(usb, dtv5100_table);

static struct dvb_usb_device_properties dtv5100_properties = {
@@ -201,7 +206,7 @@ static struct dvb_usb_device_properties dtv5100_properties = {
{
.name = "AME DTV-5100 USB2.0 DVB-T",
.cold_ids = { NULL },
- .warm_ids = { &dtv5100_table[0], NULL },
+ .warm_ids = { &dtv5100_table[AME_DTV5100], NULL },
},
}
};
--
2.35.1