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

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



This converts the drivers in drivers/net/* 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: Wolfgang Grandegger <wg@grandegger.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: Oliver Neukum <oliver@neukum.name>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Petko Manolov <petkan@users.sourceforge.net>
Cc: Steve Glendinning <steve.glendinning@smsc.com>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: Dan Williams <dcbw@redhat.com>
Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Gertjan van Wingerde <gwingerde@gmail.com>
Cc: Helmut Schaa <helmut.schaa@googlemail.com>
Cc: Herton Ronaldo Krzesinski <herton@canonical.com>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Chaoming Li <chaoming_li@realsil.com.cn>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jiri Pirko <jpirko@redhat.com>
Cc: Pavel Roskin <proski@gnu.org>
Cc: Yoann DI-RUZZA <y.diruzza@lim.eu>
Cc: George <george0505@realtek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bac2c126

drivers/net/can/usb/ems_usb.c

+1 −25
Original line number Diff line number Diff line
@@ -1115,28 +1115,4 @@ static struct usb_driver ems_usb_driver = { 
	.id_table = ems_usb_table,

};



static int __init ems_usb_init(void)

{

	int err;



	printk(KERN_INFO "CPC-USB kernel driver loaded\n");



	/* register this driver with the USB subsystem */

	err = usb_register(&ems_usb_driver);



	if (err) {

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

		return err;

	}



	return 0;

}



static void __exit ems_usb_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&ems_usb_driver);

}



module_init(ems_usb_init);

module_exit(ems_usb_exit);
 
module_usb_driver(ems_usb_driver);

drivers/net/can/usb/esd_usb2.c

+1 −22
Original line number Diff line number Diff line
@@ -1108,25 +1108,4 @@ static struct usb_driver esd_usb2_driver = { 
	.id_table = esd_usb2_table,

};



static int __init esd_usb2_init(void)

{

	int err;



	/* register this driver with the USB subsystem */

	err = usb_register(&esd_usb2_driver);



	if (err) {

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

		return err;

	}



	return 0;

}

module_init(esd_usb2_init);



static void __exit esd_usb2_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&esd_usb2_driver);

}

module_exit(esd_usb2_exit);
 
module_usb_driver(esd_usb2_driver);

drivers/net/irda/irda-usb.c

+1 −34
Original line number Diff line number Diff line
@@ -1914,41 +1914,8 @@ static struct usb_driver irda_driver = { 
#endif

};



/************************* MODULE CALLBACKS *************************/

/*

 * Deal with module insertion/removal

 * Mostly tell USB about our existence

 */



/*------------------------------------------------------------------*/

/*

 * Module insertion

 */

static int __init usb_irda_init(void)

{

	int	ret;



	ret = usb_register(&irda_driver);

	if (ret < 0)

		return ret;

module_usb_driver(irda_driver);



	IRDA_MESSAGE("USB IrDA support registered\n");

	return 0;

}

module_init(usb_irda_init);



/*------------------------------------------------------------------*/

/*

 * Module removal

 */

static void __exit usb_irda_cleanup(void)

{

	/* Deregister the driver and remove all pending instances */

	usb_deregister(&irda_driver);

}

module_exit(usb_irda_cleanup);



/*------------------------------------------------------------------*/

/*

 * Module parameters

 */

drivers/net/irda/kingsun-sir.c

+1 −18
Original line number Diff line number Diff line
@@ -621,24 +621,7 @@ static struct usb_driver irda_driver = { 
#endif

};



/*

 * Module insertion

 */

static int __init kingsun_init(void)

{

	return usb_register(&irda_driver);

}

module_init(kingsun_init);



/*

 * Module removal

 */

static void __exit kingsun_cleanup(void)

{

	/* Deregister the driver and remove all pending instances */

	usb_deregister(&irda_driver);

}

module_exit(kingsun_cleanup);

module_usb_driver(irda_driver);



MODULE_AUTHOR("Alex Villacís Lasso <a_villacis@palosanto.com>");

MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun/DonShine");

drivers/net/irda/ks959-sir.c

+1 −20
Original line number Diff line number Diff line
@@ -901,26 +901,7 @@ static struct usb_driver irda_driver = { 
#endif

};



/*

 * Module insertion

 */

static int __init ks959_init(void)

{

	return usb_register(&irda_driver);

}



module_init(ks959_init);



/*

 * Module removal

 */

static void __exit ks959_cleanup(void)

{

	/* Deregister the driver and remove all pending instances */

	usb_deregister(&irda_driver);

}



module_exit(ks959_cleanup);

module_usb_driver(irda_driver);



MODULE_AUTHOR("Alex Villacís Lasso <a_villacis@palosanto.com>");

MODULE_DESCRIPTION("IrDA-USB Dongle Driver for KingSun KS-959");

CRA Git | Maintained and supported by SUSTech CRA and CCSE