[media] dvb_usb_v2: use .driver_info to pass struct dvb_usb_device_properties

Use struct usb_device_id .driver_info to pass struct dvb_usb_device_properties
pointer for the DVB USB.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
index 1ee95c1f93e538a381067bd7c02e14c9fd390b08..7f1f10989de4bf863a8b14516091d09f9798d7ae 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -461,7 +461,7 @@ struct dvb_usb_device {
 };
 
 extern int dvb_usbv2_device_init(struct usb_interface *,
-                              struct dvb_usb_device_properties *,
+                               const struct usb_device_id *,
                               struct module *,
                               short *adapter_nums);
 extern void dvb_usbv2_device_exit(struct usb_interface *);

diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 367d1600fb7ba8ca7d5949abf1ac243934ea0444..93b45546181a60702912b3a2ac243229c26f280c 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -234,13 +234,15 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff)
  * USB
  */
 int dvb_usbv2_device_init(struct usb_interface *intf,
-                       struct dvb_usb_device_properties *props,
+                       const struct usb_device_id *id,
                        struct module *owner,
                        short *adapter_nums)
 {
        struct usb_device *udev = interface_to_usbdev(intf);
        struct dvb_usb_device *d = NULL;
        struct dvb_usb_device_description *desc = NULL;
+       struct dvb_usb_device_properties *props =
+                       (struct dvb_usb_device_properties *) id->driver_info;
 
        int ret = -ENOMEM, cold = 0;