Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08a4f6bc authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

usb-serial: use new registration API in [a-c]* drivers 



This patch (as1523) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:

	aircable, ark3116, belkin_sa, ch341, cp210x, cyberjack,
	and cypress_m8.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 765e0ba6

drivers/usb/serial/aircable.c

+6 −17
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static struct usb_driver aircable_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id =	1,

};



static struct usb_serial_driver aircable_device = {
@@ -183,7 +182,6 @@ static struct usb_serial_driver aircable_device = { 
		.owner =	THIS_MODULE,

		.name =		"aircable",

	},

	.usb_driver = 		&aircable_driver,

	.id_table = 		id_table,

	.num_ports =		1,

	.bulk_out_size =	HCI_COMPLETE_FRAME,
@@ -194,27 +192,18 @@ static struct usb_serial_driver aircable_device = { 
	.unthrottle =		usb_serial_generic_unthrottle,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&aircable_device, NULL

};



static int __init aircable_init(void)

{

	int retval;

	retval = usb_serial_register(&aircable_device);

	if (retval)

		goto failed_serial_register;

	retval = usb_register(&aircable_driver);

	if (retval)

		goto failed_usb_register;

	return 0;



failed_usb_register:

	usb_serial_deregister(&aircable_device);

failed_serial_register:

	return retval;

	return usb_serial_register_drivers(&aircable_driver, serial_drivers);

}



static void __exit aircable_exit(void)

{

	usb_deregister(&aircable_driver);

	usb_serial_deregister(&aircable_device);

	usb_serial_deregister_drivers(&aircable_driver, serial_drivers);

}



MODULE_AUTHOR(DRIVER_AUTHOR);

drivers/usb/serial/ark3116.c

+7 −10
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ static struct usb_driver ark3116_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id =	1,

};



static struct usb_serial_driver ark3116_device = {
@@ -728,7 +727,6 @@ static struct usb_serial_driver ark3116_device = { 
		.name =		"ark3116",

	},

	.id_table =		id_table,

	.usb_driver =		&ark3116_driver,

	.num_ports =		1,

	.attach =		ark3116_attach,

	.release =		ark3116_release,
@@ -745,28 +743,27 @@ static struct usb_serial_driver ark3116_device = { 
	.process_read_urb =	ark3116_process_read_urb,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&ark3116_device, NULL

};



static int __init ark3116_init(void)

{

	int retval;



	retval = usb_serial_register(&ark3116_device);

	if (retval)

		return retval;

	retval = usb_register(&ark3116_driver);

	retval = usb_serial_register_drivers(&ark3116_driver, serial_drivers);

	if (retval == 0) {

		printk(KERN_INFO "%s:"

		       DRIVER_VERSION ":"

		       DRIVER_DESC "\n",

		       KBUILD_MODNAME);

	} else

		usb_serial_deregister(&ark3116_device);

	}

	return retval;

}



static void __exit ark3116_exit(void)

{

	usb_deregister(&ark3116_driver);

	usb_serial_deregister(&ark3116_device);

	usb_serial_deregister_drivers(&ark3116_driver, serial_drivers);

}



module_init(ark3116_init);

drivers/usb/serial/belkin_sa.c

+10 −16
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static struct usb_driver belkin_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table_combined,

	.no_dynamic_id =	1,

};



/* All of the device info needed for the serial converters */
@@ -88,7 +87,6 @@ static struct usb_serial_driver belkin_device = { 
		.name =		"belkin",

	},

	.description =		"Belkin / Peracom / GoHubs USB Serial Adapter",

	.usb_driver =		&belkin_driver,

	.id_table =		id_table_combined,

	.num_ports =		1,

	.open =			belkin_sa_open,
@@ -103,6 +101,10 @@ static struct usb_serial_driver belkin_device = { 
	.release =		belkin_sa_release,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&belkin_device, NULL

};



struct belkin_sa_private {

	spinlock_t		lock;

	unsigned long		control_state;
@@ -526,25 +528,17 @@ static int belkin_sa_tiocmset(struct tty_struct *tty, 
static int __init belkin_sa_init(void)

{

	int retval;

	retval = usb_serial_register(&belkin_device);

	if (retval)

		goto failed_usb_serial_register;

	retval = usb_register(&belkin_driver);

	if (retval)

		goto failed_usb_register;



	retval = usb_serial_register_drivers(&belkin_driver, serial_drivers);

	if (retval == 0)

		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

			       DRIVER_DESC "\n");

	return 0;

failed_usb_register:

	usb_serial_deregister(&belkin_device);

failed_usb_serial_register:

	return retval;

}



static void __exit belkin_sa_exit (void)

{

	usb_deregister(&belkin_driver);

	usb_serial_deregister(&belkin_device);

	usb_serial_deregister_drivers(&belkin_driver, serial_drivers);

}

drivers/usb/serial/ch341.c

+6 −13
Original line number Diff line number Diff line
@@ -625,7 +625,6 @@ static struct usb_driver ch341_driver = { 
	.resume		= usb_serial_resume,

	.reset_resume	= ch341_reset_resume,

	.id_table	= id_table,

	.no_dynamic_id	= 1,

	.supports_autosuspend =	1,

};
@@ -635,7 +634,6 @@ static struct usb_serial_driver ch341_device = { 
		.name	= "ch341-uart",

	},

	.id_table          = id_table,

	.usb_driver        = &ch341_driver,

	.num_ports         = 1,

	.open              = ch341_open,

	.dtr_rts	   = ch341_dtr_rts,
@@ -650,23 +648,18 @@ static struct usb_serial_driver ch341_device = { 
	.attach            = ch341_attach,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&ch341_device, NULL

};



static int __init ch341_init(void)

{

	int retval;



	retval = usb_serial_register(&ch341_device);

	if (retval)

		return retval;

	retval = usb_register(&ch341_driver);

	if (retval)

		usb_serial_deregister(&ch341_device);

	return retval;

	return usb_serial_register_drivers(&ch341_driver, serial_drivers);

}



static void __exit ch341_exit(void)

{

	usb_deregister(&ch341_driver);

	usb_serial_deregister(&ch341_device);

	usb_serial_deregister_drivers(&ch341_driver, serial_drivers);

}



module_init(ch341_init);

drivers/usb/serial/cp210x.c

+10 −19
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ static struct usb_driver cp210x_driver = { 
	.probe		= usb_serial_probe,

	.disconnect	= usb_serial_disconnect,

	.id_table	= id_table,

	.no_dynamic_id	= 	1,

};



static struct usb_serial_driver cp210x_device = {
@@ -162,7 +161,6 @@ static struct usb_serial_driver cp210x_device = { 
		.owner =	THIS_MODULE,

		.name = 	"cp210x",

	},

	.usb_driver		= &cp210x_driver,

	.id_table		= id_table,

	.num_ports		= 1,

	.bulk_in_size		= 256,
@@ -177,6 +175,10 @@ static struct usb_serial_driver cp210x_device = { 
	.dtr_rts		= cp210x_dtr_rts

};



static struct usb_serial_driver * const serial_drivers[] = {

	&cp210x_device, NULL

};



/* Config request types */

#define REQTYPE_HOST_TO_DEVICE	0x41

#define REQTYPE_DEVICE_TO_HOST	0xc1
@@ -852,27 +854,16 @@ static int __init cp210x_init(void) 
{

	int retval;



	retval = usb_serial_register(&cp210x_device);

	if (retval)

		return retval; /* Failed to register */



	retval = usb_register(&cp210x_driver);

	if (retval) {

		/* Failed to register */

		usb_serial_deregister(&cp210x_device);

		return retval;

	}



	/* Success */

	retval = usb_serial_register_drivers(&cp210x_driver, serial_drivers);

	if (retval == 0)

		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

			       DRIVER_DESC "\n");

	return 0;

	return retval;

}



static void __exit cp210x_exit(void)

{

	usb_deregister(&cp210x_driver);

	usb_serial_deregister(&cp210x_device);

	usb_serial_deregister_drivers(&cp210x_driver, serial_drivers);

}



module_init(cp210x_init);