OSDN Git Service

media: dvb-usb-v2: use DVB_USB_DEVICE() macro
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 16 Apr 2020 14:11:52 +0000 (16:11 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 22 Apr 2020 05:42:15 +0000 (07:42 +0200)
Instead of using USB_DEVICE() macro directly, use the
DVB_USB_DEVICE() one, as other dvb-usb-v2 devices.

The usage of the new macro makes cleaner and easier to
parse the supported device names in a way that it would
be easily parseable to generate cardlists.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/usb/dvb-usb-v2/ec168.c

index e303058..7ed0ab9 100644 (file)
@@ -332,22 +332,17 @@ static const struct dvb_usb_device_properties ec168_props = {
        },
 };
 
-static const struct dvb_usb_driver_info ec168_driver_info = {
-       .name = "E3C EC168 reference design",
-       .props = &ec168_props,
-};
-
 static const struct usb_device_id ec168_id[] = {
-       { USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168),
-               .driver_info = (kernel_ulong_t) &ec168_driver_info },
-       { USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_2),
-               .driver_info = (kernel_ulong_t) &ec168_driver_info },
-       { USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_3),
-               .driver_info = (kernel_ulong_t) &ec168_driver_info },
-       { USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_4),
-               .driver_info = (kernel_ulong_t) &ec168_driver_info },
-       { USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_5),
-               .driver_info = (kernel_ulong_t) &ec168_driver_info },
+       { DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168,
+                    &ec168_props, "E3C EC168 reference design", NULL)},
+       { DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_2,
+                    &ec168_props, "E3C EC168 reference design", NULL)},
+       { DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_3,
+                    &ec168_props, "E3C EC168 reference design", NULL)},
+       { DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_4,
+                    &ec168_props, "E3C EC168 reference design", NULL)},
+       { DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_5,
+                    &ec168_props, "E3C EC168 reference design", NULL)},
        {}
 };
 MODULE_DEVICE_TABLE(usb, ec168_id);