[media] dvb_usb_v2: remove one parameter from dvb_usbv2_device_init()

Users should use new .init() callback instead.

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 15b08b777e6db1d9a37ca94eff7657f91b3d69db..1ee95c1f93e538a381067bd7c02e14c9fd390b08 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -462,7 +462,7 @@ struct dvb_usb_device {
 
 extern int dvb_usbv2_device_init(struct usb_interface *,
                               struct dvb_usb_device_properties *,
-                              struct module *, struct dvb_usb_device **,
+                              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 0d769a1c180716865113fd16918781fb9a080ffe..367d1600fb7ba8ca7d5949abf1ac243934ea0444 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -235,7 +235,7 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff)
  */
 int dvb_usbv2_device_init(struct usb_interface *intf,
                        struct dvb_usb_device_properties *props,
-                       struct module *owner, struct dvb_usb_device **du,
+                       struct module *owner,
                        short *adapter_nums)
 {
        struct usb_device *udev = interface_to_usbdev(intf);
@@ -244,9 +244,6 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 
        int ret = -ENOMEM, cold = 0;
 
-       if (du != NULL)
-               *du = NULL;
-
        if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) {
                deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
                return -ENODEV;
@@ -273,9 +270,6 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 
        usb_set_intfdata(intf, d);
 
-       if (du != NULL)
-               *du = d;
-
        ret = dvb_usb_init(d, adapter_nums);
 
        if (ret == 0)