usb-serial: use new registration API in [i-j]* drivers (7dbe2460) · Commits · e / devices / android_kernel_teracube_emerald

drivers/usb/serial/io_edgeport.c

+7 −34

Original line number	Original line	Diff line number	Diff line
	@@ -3189,35 +3189,12 @@ static int __init edgeport_init(void)
	{		{
	int retval;		int retval;

	retval = usb_serial_register(&edgeport_2port_device);		retval = usb_serial_register_drivers(&io_driver, serial_drivers);
	if (retval)		if (retval == 0) {
	goto failed_2port_device_register;
	retval = usb_serial_register(&edgeport_4port_device);
	if (retval)
	goto failed_4port_device_register;
	retval = usb_serial_register(&edgeport_8port_device);
	if (retval)
	goto failed_8port_device_register;
	retval = usb_serial_register(&epic_device);
	if (retval)
	goto failed_epic_device_register;
	retval = usb_register(&io_driver);
	if (retval)
	goto failed_usb_register;
	atomic_set(&CmdUrbs, 0);		atomic_set(&CmdUrbs, 0);
	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
	DRIVER_DESC "\n");		DRIVER_DESC "\n");
	return 0;		}

	failed_usb_register:
	usb_serial_deregister(&epic_device);
	failed_epic_device_register:
	usb_serial_deregister(&edgeport_8port_device);
	failed_8port_device_register:
	usb_serial_deregister(&edgeport_4port_device);
	failed_4port_device_register:
	usb_serial_deregister(&edgeport_2port_device);
	failed_2port_device_register:
	return retval;		return retval;
	}		}

	@@ -3228,11 +3205,7 @@ static int __init edgeport_init(void)
	****************************************************************************/		****************************************************************************/
	static void __exit edgeport_exit (void)		static void __exit edgeport_exit (void)
	{		{
	usb_deregister(&io_driver);		usb_serial_deregister_drivers(&io_driver, serial_drivers);
	usb_serial_deregister(&edgeport_2port_device);
	usb_serial_deregister(&edgeport_4port_device);
	usb_serial_deregister(&edgeport_8port_device);
	usb_serial_deregister(&epic_device);
	}		}

	module_init(edgeport_init);		module_init(edgeport_init);

drivers/usb/serial/io_tables.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,6 @@ static struct usb_driver io_driver = {
	.probe = usb_serial_probe,		.probe = usb_serial_probe,
	.disconnect = usb_serial_disconnect,		.disconnect = usb_serial_disconnect,
	.id_table = id_table_combined,		.id_table = id_table_combined,
	.no_dynamic_id = 1,
	};		};

	static struct usb_serial_driver edgeport_2port_device = {		static struct usb_serial_driver edgeport_2port_device = {
	@@ -109,7 +108,6 @@ static struct usb_serial_driver edgeport_2port_device = {
	.name = "edgeport_2",		.name = "edgeport_2",
	},		},
	.description = "Edgeport 2 port adapter",		.description = "Edgeport 2 port adapter",
	.usb_driver = &io_driver,
	.id_table = edgeport_2port_id_table,		.id_table = edgeport_2port_id_table,
	.num_ports = 2,		.num_ports = 2,
	.open = edge_open,		.open = edge_open,
	@@ -139,7 +137,6 @@ static struct usb_serial_driver edgeport_4port_device = {
	.name = "edgeport_4",		.name = "edgeport_4",
	},		},
	.description = "Edgeport 4 port adapter",		.description = "Edgeport 4 port adapter",
	.usb_driver = &io_driver,
	.id_table = edgeport_4port_id_table,		.id_table = edgeport_4port_id_table,
	.num_ports = 4,		.num_ports = 4,
	.open = edge_open,		.open = edge_open,
	@@ -169,7 +166,6 @@ static struct usb_serial_driver edgeport_8port_device = {
	.name = "edgeport_8",		.name = "edgeport_8",
	},		},
	.description = "Edgeport 8 port adapter",		.description = "Edgeport 8 port adapter",
	.usb_driver = &io_driver,
	.id_table = edgeport_8port_id_table,		.id_table = edgeport_8port_id_table,
	.num_ports = 8,		.num_ports = 8,
	.open = edge_open,		.open = edge_open,
	@@ -199,7 +195,6 @@ static struct usb_serial_driver epic_device = {
	.name = "epic",		.name = "epic",
	},		},
	.description = "EPiC device",		.description = "EPiC device",
	.usb_driver = &io_driver,
	.id_table = Epic_port_id_table,		.id_table = Epic_port_id_table,
	.num_ports = 1,		.num_ports = 1,
	.open = edge_open,		.open = edge_open,
	@@ -223,5 +218,10 @@ static struct usb_serial_driver epic_device = {
	.write_bulk_callback = edge_bulk_out_data_callback,		.write_bulk_callback = edge_bulk_out_data_callback,
	};		};

			static struct usb_serial_driver * const serial_drivers[] = {
			&edgeport_2port_device, &edgeport_4port_device,
			&edgeport_8port_device, &epic_device, NULL
			};

	#endif		#endif

drivers/usb/serial/io_ti.c

+10 −23

Original line number	Original line	Diff line number	Diff line
	@@ -202,7 +202,6 @@ static struct usb_driver io_driver = {
	.probe = usb_serial_probe,		.probe = usb_serial_probe,
	.disconnect = usb_serial_disconnect,		.disconnect = usb_serial_disconnect,
	.id_table = id_table_combined,		.id_table = id_table_combined,
	.no_dynamic_id = 1,
	};		};


	@@ -2725,7 +2724,6 @@ static struct usb_serial_driver edgeport_1port_device = {
	.name = "edgeport_ti_1",		.name = "edgeport_ti_1",
	},		},
	.description = "Edgeport TI 1 port adapter",		.description = "Edgeport TI 1 port adapter",
	.usb_driver = &io_driver,
	.id_table = edgeport_1port_id_table,		.id_table = edgeport_1port_id_table,
	.num_ports = 1,		.num_ports = 1,
	.open = edge_open,		.open = edge_open,
	@@ -2757,7 +2755,6 @@ static struct usb_serial_driver edgeport_2port_device = {
	.name = "edgeport_ti_2",		.name = "edgeport_ti_2",
	},		},
	.description = "Edgeport TI 2 port adapter",		.description = "Edgeport TI 2 port adapter",
	.usb_driver = &io_driver,
	.id_table = edgeport_2port_id_table,		.id_table = edgeport_2port_id_table,
	.num_ports = 2,		.num_ports = 2,
	.open = edge_open,		.open = edge_open,
	@@ -2782,35 +2779,25 @@ static struct usb_serial_driver edgeport_2port_device = {
	.write_bulk_callback = edge_bulk_out_callback,		.write_bulk_callback = edge_bulk_out_callback,
	};		};

			static struct usb_serial_driver * const serial_drivers[] = {
			&edgeport_1port_device, &edgeport_2port_device, NULL
			};


	static int __init edgeport_init(void)		static int __init edgeport_init(void)
	{		{
	int retval;		int retval;
	retval = usb_serial_register(&edgeport_1port_device);
	if (retval)		retval = usb_serial_register_drivers(&io_driver, serial_drivers);
	goto failed_1port_device_register;		if (retval == 0)
	retval = usb_serial_register(&edgeport_2port_device);
	if (retval)
	goto failed_2port_device_register;
	retval = usb_register(&io_driver);
	if (retval)
	goto failed_usb_register;
	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
	DRIVER_DESC "\n");		DRIVER_DESC "\n");
	return 0;
	failed_usb_register:
	usb_serial_deregister(&edgeport_2port_device);
	failed_2port_device_register:
	usb_serial_deregister(&edgeport_1port_device);
	failed_1port_device_register:
	return retval;		return retval;
	}		}

	static void __exit edgeport_exit(void)		static void __exit edgeport_exit(void)
	{		{
	usb_deregister(&io_driver);		usb_serial_deregister_drivers(&io_driver, serial_drivers);
	usb_serial_deregister(&edgeport_1port_device);
	usb_serial_deregister(&edgeport_2port_device);
	}		}

	module_init(edgeport_init);		module_init(edgeport_init);

drivers/usb/serial/ipaq.c

+11 −17

Original line number	Original line	Diff line number	Diff line
	@@ -510,7 +510,6 @@ static struct usb_driver ipaq_driver = {
	.probe = usb_serial_probe,		.probe = usb_serial_probe,
	.disconnect = usb_serial_disconnect,		.disconnect = usb_serial_disconnect,
	.id_table = ipaq_id_table,		.id_table = ipaq_id_table,
	.no_dynamic_id = 1,
	};		};


	@@ -521,7 +520,6 @@ static struct usb_serial_driver ipaq_device = {
	.name = "ipaq",		.name = "ipaq",
	},		},
	.description = "PocketPC PDA",		.description = "PocketPC PDA",
	.usb_driver = &ipaq_driver,
	.id_table = ipaq_id_table,		.id_table = ipaq_id_table,
	.bulk_in_size = 256,		.bulk_in_size = 256,
	.bulk_out_size = 256,		.bulk_out_size = 256,
	@@ -530,6 +528,10 @@ static struct usb_serial_driver ipaq_device = {
	.calc_num_ports = ipaq_calc_num_ports,		.calc_num_ports = ipaq_calc_num_ports,
	};		};

			static struct usb_serial_driver * const serial_drivers[] = {
			&ipaq_device, NULL
			};

	static int ipaq_open(struct tty_struct *tty,		static int ipaq_open(struct tty_struct *tty,
	struct usb_serial_port *port)		struct usb_serial_port *port)
	{		{
	@@ -624,30 +626,22 @@ static int ipaq_startup(struct usb_serial *serial)
	static int __init ipaq_init(void)		static int __init ipaq_init(void)
	{		{
	int retval;		int retval;
	retval = usb_serial_register(&ipaq_device);
	if (retval)
	goto failed_usb_serial_register;
	if (vendor) {		if (vendor) {
	ipaq_id_table[0].idVendor = vendor;		ipaq_id_table[0].idVendor = vendor;
	ipaq_id_table[0].idProduct = product;		ipaq_id_table[0].idProduct = product;
	}		}
	retval = usb_register(&ipaq_driver);
	if (retval)
	goto failed_usb_register;

			retval = usb_serial_register_drivers(&ipaq_driver, serial_drivers);
			if (retval == 0)
	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
	DRIVER_DESC "\n");		DRIVER_DESC "\n");
	return 0;
	failed_usb_register:
	usb_serial_deregister(&ipaq_device);
	failed_usb_serial_register:
	return retval;		return retval;
	}		}

	static void __exit ipaq_exit(void)		static void __exit ipaq_exit(void)
	{		{
	usb_deregister(&ipaq_driver);		usb_serial_deregister_drivers(&ipaq_driver, serial_drivers);
	usb_serial_deregister(&ipaq_device);
	}		}

drivers/usb/serial/ipw.c

+9 −15

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,6 @@ static struct usb_driver usb_ipw_driver = {
	.probe = usb_serial_probe,		.probe = usb_serial_probe,
	.disconnect = usb_serial_disconnect,		.disconnect = usb_serial_disconnect,
	.id_table = usb_ipw_ids,		.id_table = usb_ipw_ids,
	.no_dynamic_id = 1,
	};		};

	static bool debug;		static bool debug;
	@@ -318,7 +317,6 @@ static struct usb_serial_driver ipw_device = {
	.name = "ipw",		.name = "ipw",
	},		},
	.description = "IPWireless converter",		.description = "IPWireless converter",
	.usb_driver = &usb_ipw_driver,
	.id_table = usb_ipw_ids,		.id_table = usb_ipw_ids,
	.num_ports = 1,		.num_ports = 1,
	.disconnect = usb_wwan_disconnect,		.disconnect = usb_wwan_disconnect,
	@@ -331,29 +329,25 @@ static struct usb_serial_driver ipw_device = {
	.write = usb_wwan_write,		.write = usb_wwan_write,
	};		};

			static struct usb_serial_driver * const serial_drivers[] = {
			&ipw_device, NULL
			};


	static int __init usb_ipw_init(void)		static int __init usb_ipw_init(void)
	{		{
	int retval;		int retval;

	retval = usb_serial_register(&ipw_device);		retval = usb_serial_register_drivers(&usb_ipw_driver, serial_drivers);
	if (retval)		if (retval == 0)
	return retval;
	retval = usb_register(&usb_ipw_driver);
	if (retval) {
	usb_serial_deregister(&ipw_device);
	return retval;
	}
	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
	DRIVER_DESC "\n");		DRIVER_DESC "\n");
	return 0;		return retval;
	}		}

	static void __exit usb_ipw_exit(void)		static void __exit usb_ipw_exit(void)
	{		{
	usb_deregister(&usb_ipw_driver);		usb_serial_deregister_drivers(&usb_ipw_driver, serial_drivers);
	usb_serial_deregister(&ipw_device);
	}		}

	module_init(usb_ipw_init);		module_init(usb_ipw_init);