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

USB: convert some miscellanies drivers to use module_usb_driver() 



This converts the remaining USB drivers in the kernel 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: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Till Harbaum <till@harbaum.org>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Steve Glendinning <steve.glendinning@smsc.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 424f0750

drivers/i2c/busses/i2c-diolan-u2c.c

+1 −14
Original line number Diff line number Diff line
@@ -515,20 +515,7 @@ static struct usb_driver diolan_u2c_driver = { 
	.id_table = diolan_u2c_table,

};



static int __init diolan_u2c_init(void)

{

	/* register this driver with the USB subsystem */

	return usb_register(&diolan_u2c_driver);

}



static void __exit diolan_u2c_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&diolan_u2c_driver);

}



module_init(diolan_u2c_init);

module_exit(diolan_u2c_exit);

module_usb_driver(diolan_u2c_driver);



MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");

MODULE_DESCRIPTION(DRIVER_NAME " driver");

drivers/i2c/busses/i2c-tiny-usb.c

+1 −14
Original line number Diff line number Diff line
@@ -262,20 +262,7 @@ static struct usb_driver i2c_tiny_usb_driver = { 
	.id_table	= i2c_tiny_usb_table,

};



static int __init usb_i2c_tiny_usb_init(void)

{

	/* register this driver with the USB subsystem */

	return usb_register(&i2c_tiny_usb_driver);

}



static void __exit usb_i2c_tiny_usb_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&i2c_tiny_usb_driver);

}



module_init(usb_i2c_tiny_usb_init);

module_exit(usb_i2c_tiny_usb_exit);

module_usb_driver(i2c_tiny_usb_driver);



/* ----- end of usb layer ------------------------------------------------ */

drivers/isdn/hardware/mISDN/hfcsusb.c

+1 −27
Original line number Diff line number Diff line
@@ -2154,30 +2154,4 @@ static struct usb_driver hfcsusb_drv = { 
	.disconnect = hfcsusb_disconnect,

};



static int __init

hfcsusb_init(void)

{

	printk(KERN_INFO DRIVER_NAME " driver Rev. %s debug(0x%x) poll(%i)\n",

	    hfcsusb_rev, debug, poll);



	if (usb_register(&hfcsusb_drv)) {

		printk(KERN_INFO DRIVER_NAME

		    ": Unable to register hfcsusb module at usb stack\n");

		return -ENODEV;

	}



	return 0;

}



static void __exit

hfcsusb_cleanup(void)

{

	if (debug & DBG_HFC_CALL_TRACE)

		printk(KERN_INFO DRIVER_NAME ": %s\n", __func__);



	/* unregister Hardware */

	usb_deregister(&hfcsusb_drv);	/* release our driver */

}



module_init(hfcsusb_init);

module_exit(hfcsusb_cleanup);
 
module_usb_driver(hfcsusb_drv);

drivers/mmc/host/ushc.c

+1 −11
Original line number Diff line number Diff line
@@ -562,17 +562,7 @@ static struct usb_driver ushc_driver = { 
	.disconnect = ushc_disconnect,

};



static int __init ushc_init(void)

{

	return usb_register(&ushc_driver);

}

module_init(ushc_init);



static void __exit ushc_exit(void)

{

	usb_deregister(&ushc_driver);

}

module_exit(ushc_exit);

module_usb_driver(ushc_driver);



MODULE_DESCRIPTION("USB SD Host Controller driver");

MODULE_AUTHOR("David Vrabel <david.vrabel@csr.com>");

drivers/mtd/nand/alauda.c

+1 −12
Original line number Diff line number Diff line
@@ -717,17 +717,6 @@ static struct usb_driver alauda_driver = { 
	.id_table =	alauda_table,

};



static int __init alauda_init(void)

{

	return usb_register(&alauda_driver);

}



static void __exit alauda_exit(void)

{

	usb_deregister(&alauda_driver);

}



module_init(alauda_init);

module_exit(alauda_exit);

module_usb_driver(alauda_driver);



MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE