Commit 47dc3d68 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Linus Torvalds
Browse files

[PATCH] dvb: usb: core: change dvb_usb_device_init() API 



Change the init call to optionally return the new dvb_usb_device directly.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 62703b9d

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

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static struct dvb_usb_properties a800_properties; 
static int a800_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	return dvb_usb_device_init(intf,&a800_properties,THIS_MODULE);

	return dvb_usb_device_init(intf,&a800_properties,THIS_MODULE,NULL);

}



/* do not change the order of the ID table */

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static struct dvb_usb_properties cxusb_properties; 
static int cxusb_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	return dvb_usb_device_init(intf,&cxusb_properties,THIS_MODULE);

	return dvb_usb_device_init(intf,&cxusb_properties,THIS_MODULE,NULL);

}



static struct usb_device_id cxusb_table [] = {

drivers/media/dvb/dvb-usb/dibusb-mb.c

+3 −3
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ static struct dvb_usb_properties dibusb2_0b_properties; 
static int dibusb_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE) == 0 ||

		dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE) == 0 ||

		dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE) == 0)

	if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE,NULL) == 0 ||

		dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE,NULL) == 0 ||

		dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0)

		return 0;



	return -EINVAL;

drivers/media/dvb/dvb-usb/dibusb-mc.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static struct dvb_usb_properties dibusb_mc_properties; 
static int dibusb_mc_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	return dvb_usb_device_init(intf,&dibusb_mc_properties,THIS_MODULE);

	return dvb_usb_device_init(intf,&dibusb_mc_properties,THIS_MODULE,NULL);

}



/* do not change the order of the ID table */

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct dvb_usb_properties digitv_properties; 
static int digitv_probe(struct usb_interface *intf,

		const struct usb_device_id *id)

{

	return dvb_usb_device_init(intf,&digitv_properties,THIS_MODULE);

	return dvb_usb_device_init(intf,&digitv_properties,THIS_MODULE,NULL);

}



static struct usb_device_id digitv_table [] = {