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

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



This converts the drivers in drivers/input/* 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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Henk Vergonet <Henk.Vergonet@gmail.com>
Cc: Alessandro Rubini <rubini@ipvvis.unipv.it>
Cc: Henrik Rydberg <rydberg@euromail.se>
Cc: "Magnus Hörlin" <magnus@alefors.se>
Cc: Chris Moeller <kode54@gmail.c>
Cc: Christoph Fritz <chf.fritz@googlemail.com>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Edwin van Vliet <edwin@cheatah.nl>
Cc: Ping Cheng <pingc@wacom.com>
Cc: Eduard Hasenleithner <eduard@hasenleithner.at>
Cc: Alexander Strakh <strakh@ispras.ru>
Cc: Glenn Sommer <gsommer@datanordisk.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 93f1508c

drivers/input/joystick/xpad.c

+1 −12
Original line number Diff line number Diff line
@@ -1041,18 +1041,7 @@ static struct usb_driver xpad_driver = { 
	.id_table	= xpad_table,

};



static int __init usb_xpad_init(void)

{

	return usb_register(&xpad_driver);

}



static void __exit usb_xpad_exit(void)

{

	usb_deregister(&xpad_driver);

}



module_init(usb_xpad_init);

module_exit(usb_xpad_exit);

module_usb_driver(xpad_driver);



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

drivers/input/misc/ati_remote2.c

+1 −20
Original line number Diff line number Diff line
@@ -1010,23 +1010,4 @@ static int ati_remote2_post_reset(struct usb_interface *interface) 
	return r;

}



static int __init ati_remote2_init(void)

{

	int r;



	r = usb_register(&ati_remote2_driver);

	if (r)

		printk(KERN_ERR "ati_remote2: usb_register() = %d\n", r);

	else

		printk(KERN_INFO "ati_remote2: " DRIVER_DESC " " DRIVER_VERSION "\n");



	return r;

}



static void __exit ati_remote2_exit(void)

{

	usb_deregister(&ati_remote2_driver);

}



module_init(ati_remote2_init);

module_exit(ati_remote2_exit);
 
module_usb_driver(ati_remote2_driver);

drivers/input/misc/keyspan_remote.c

+1 −20
Original line number Diff line number Diff line
@@ -580,26 +580,7 @@ static struct usb_driver keyspan_driver = 
	.id_table =	keyspan_table

};



static int __init usb_keyspan_init(void)

{

	int result;



	/* register this driver with the USB subsystem */

	result = usb_register(&keyspan_driver);

	if (result)

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



	return result;

}



static void __exit usb_keyspan_exit(void)

{

	/* deregister this driver with the USB subsystem */

	usb_deregister(&keyspan_driver);

}



module_init(usb_keyspan_init);

module_exit(usb_keyspan_exit);

module_usb_driver(keyspan_driver);



MODULE_DEVICE_TABLE(usb, keyspan_table);

MODULE_AUTHOR(DRIVER_AUTHOR);

drivers/input/misc/powermate.c

+1 −12
Original line number Diff line number Diff line
@@ -441,18 +441,7 @@ static struct usb_driver powermate_driver = { 
        .id_table =     powermate_devices,

};



static int __init powermate_init(void)

{

	return usb_register(&powermate_driver);

}



static void __exit powermate_cleanup(void)

{

	usb_deregister(&powermate_driver);

}



module_init(powermate_init);

module_exit(powermate_cleanup);

module_usb_driver(powermate_driver);



MODULE_AUTHOR( "William R Sowerbutts" );

MODULE_DESCRIPTION( "Griffin Technology, Inc PowerMate driver" );

drivers/input/misc/yealink.c

+1 −16
Original line number Diff line number Diff line
@@ -988,22 +988,7 @@ static struct usb_driver yealink_driver = { 
	.id_table	= usb_table,

};



static int __init yealink_dev_init(void)

{

	int ret = usb_register(&yealink_driver);

	if (ret == 0)

		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"

		       DRIVER_DESC "\n");

	return ret;

}



static void __exit yealink_dev_exit(void)

{

	usb_deregister(&yealink_driver);

}



module_init(yealink_dev_init);

module_exit(yealink_dev_exit);

module_usb_driver(yealink_driver);



MODULE_DEVICE_TABLE (usb, usb_table);

CRA Git | Maintained and supported by SUSTech CRA and CCSE