Skip to content

Commit

Permalink
[media] dvb_usb_v2: remove one parameter from dvb_usbv2_device_init()
Browse files Browse the repository at this point in the history
Users should use new .init() callback instead.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent dc78693 commit 1bf325d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/dvb_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

Expand Down
8 changes: 1 addition & 7 deletions drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 1bf325d

Please sign in to comment.