Commit bac2c126 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: convert drivers/staging/* to use module_usb_driver() 



This converts the drivers in drivers/staging/* to use the
module_usb_driver() macro which makes the code smaller and a bit
simpler.

Added bonus is that it removes some unneeded kernel log messages about
drivers loading and/or unloading.

Cc: "David Täht" <d@teklibre.com>
Cc: Marek Belisko <marek.belisko@gmail.com>
Cc: Al Cho <acho@novell.com>
Cc: Forest Bond <forest@alittletooquiet.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Huajun Li <huajun.li.lee@gmail.com>
Cc: Zac Storer <zac.3.14159@gmail.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: edwin_rong <edwin_rong@realsil.com.cn>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Julia Lawall <julia@diku.dk>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Joe Perches <joe@perches.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 65db4305

drivers/staging/frontier/alphatrack.c

+1 −27
Original line number Diff line number Diff line
@@ -867,30 +867,4 @@ static struct usb_driver usb_alphatrack_driver = { 
	.id_table = usb_alphatrack_table,

};



/**

 *	usb_alphatrack_init

 */

static int __init usb_alphatrack_init(void)

{

	int retval;



	/* register this driver with the USB subsystem */

	retval = usb_register(&usb_alphatrack_driver);

	if (retval)

		err("usb_register failed for the " __FILE__

		    " driver. Error number %d\n", retval);



	return retval;

}



/**

 *	usb_alphatrack_exit

 */

static void __exit usb_alphatrack_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&usb_alphatrack_driver);

}



module_init(usb_alphatrack_init);

module_exit(usb_alphatrack_exit);
 
module_usb_driver(usb_alphatrack_driver);

drivers/staging/frontier/tranzport.c

+1 −26
Original line number Diff line number Diff line
@@ -971,29 +971,4 @@ static struct usb_driver usb_tranzport_driver = { 
	.id_table = usb_tranzport_table,

};



/**

 *	usb_tranzport_init

 */

static int __init usb_tranzport_init(void)

{

	int retval;



	/* register this driver with the USB subsystem */

	retval = usb_register(&usb_tranzport_driver);

	if (retval)

		err("usb_register failed for the " __FILE__

			" driver. Error number %d\n", retval);

	return retval;

}

/**

 *	usb_tranzport_exit

 */



static void __exit usb_tranzport_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&usb_tranzport_driver);

}



module_init(usb_tranzport_init);

module_exit(usb_tranzport_exit);
 
module_usb_driver(usb_tranzport_driver);

drivers/staging/ft1000/ft1000-usb/ft1000_usb.c

+1 −21
Original line number Diff line number Diff line
@@ -263,24 +263,4 @@ static struct usb_driver ft1000_usb_driver = { 
	.id_table = id_table,

};



static int __init usb_ft1000_init(void)

{

	int ret = 0;



	DEBUG("Initialize and register the driver\n");



	ret = usb_register(&ft1000_usb_driver);

	if (ret)

		err("usb_register failed. Error number %d", ret);



	return ret;

}



static void __exit usb_ft1000_exit(void)

{

	DEBUG("Deregister the driver\n");

	usb_deregister(&ft1000_usb_driver);

}



module_init(usb_ft1000_init);

module_exit(usb_ft1000_exit);
 
module_usb_driver(ft1000_usb_driver);

drivers/staging/keucr/usb.c

+1 −23
Original line number Diff line number Diff line
@@ -701,26 +701,4 @@ static struct usb_driver usb_storage_driver = { 
	.soft_unbind =	1,

};



//----- usb_stor_init() ---------------------

static int __init usb_stor_init(void)

{

	int retval;

	pr_info("usb --- usb_stor_init start\n");



	retval = usb_register(&usb_storage_driver);

	if (retval == 0)

		pr_info("ENE USB Mass Storage support registered.\n");



	return retval;

}



//----- usb_stor_exit() ---------------------

static void __exit usb_stor_exit(void)

{

	pr_info("usb --- usb_stor_exit\n");



	usb_deregister(&usb_storage_driver) ;

}



module_init(usb_stor_init);

module_exit(usb_stor_exit);
 
module_usb_driver(usb_storage_driver);

drivers/staging/media/go7007/go7007-usb.c

+1 −14
Original line number Diff line number Diff line
@@ -1272,17 +1272,4 @@ static struct usb_driver go7007_usb_driver = { 
	.id_table	= go7007_usb_id_table,

};



static int __init go7007_usb_init(void)

{

	return usb_register(&go7007_usb_driver);

}



static void __exit go7007_usb_cleanup(void)

{

	usb_deregister(&go7007_usb_driver);

}



module_init(go7007_usb_init);

module_exit(go7007_usb_cleanup);



MODULE_LICENSE("GPL v2");
 
module_usb_driver(go7007_usb_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE