Commit 1bf325db authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

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



Users should use new .init() callback instead.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dc786937

drivers/media/dvb/dvb-usb/dvb_usb.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

drivers/media/dvb/dvb-usb/dvb_usb_init.c

+1 −7
Original line number Diff line number Diff line
@@ -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)