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

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



This converts the drivers in drivers/media/* 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: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Luca Risolia <luca.risolia@studio.unibo.it>
Cc: Jean-Francois Moine <moinejf@free.fr>
Cc: Frank Zago <frank@zago.net>
Cc: Olivier Lorin <o.lorin@laposte.net>
Cc: Erik Andren <erik.andren@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Brian Johnson <brijohn@gmail.com>
Cc: Leandro Costantino <lcostantino@gmail.com>
Cc: Antoine Jacquet <royale@zerezo.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Florian Mickler <florian@mickler.org>
Cc: Antti Palosaari <crope@iki.fi>
Cc: Michael Krufky <mkrufky@kernellabs.com>
Cc: "David Härdeman" <david@hardeman.nu>
Cc: Florent Audebert <florent.audebert@anevia.com>
Cc: Sam Doshi <sam@metal-fish.co.uk>
Cc: Manu Abraham <manu@linuxtv.org>
Cc: Olivier Grenie <olivier.grenie@dibcom.fr>
Cc: Patrick Boettcher <patrick.boettcher@dibcom.fr>
Cc: "Igor M. Liplianin" <liplianin@me.by>
Cc: Derek Kelly <user.vdr@gmail.com>
Cc: Malcolm Priestley <tvboxspy@gmail.com>
Cc: Steven Toth <stoth@kernellabs.com>
Cc: "André Weidemann" <Andre.Weidemann@web.de>
Cc: Martin Wilks <m.wilks@technisat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Jose Alberto Reguero <jareguero@telefonica.net>
Cc: David Henningsson <david.henningsson@canonical.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Joe Perches <joe@perches.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>
Cc: Anssi Hannula <anssi.hannula@iki.fi>
Cc: Rafi Rubin <rafi@seas.upenn.edu>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Paul Bender <pebender@gmail.com>
Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Cc: "Márcio A Alves" <froooozen@gmail.com>
Cc: Julia Lawall <julia@diku.dk>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Chris Rankin <rankincj@yahoo.com>
Cc: Lee Jones <lee.jones@canonical.com>
Cc: Andy Walls <awalls@md.metrocast.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Dean Anderson <linux-dev@sensoray.com>
Cc: Pete Eberlein <pete@sensoray.com>
Cc: Arvydas Sidorenko <asido4@gmail.com>
Cc: Andrea Anacleto <andreaanacleto@libero.it>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d632eb1b

drivers/media/dvb/b2c2/flexcop-usb.c

+1 −19
Original line number Diff line number Diff line
@@ -583,25 +583,7 @@ static struct usb_driver flexcop_usb_driver = { 
	.id_table	= flexcop_usb_table,

};



/* module stuff */

static int __init flexcop_usb_module_init(void)

{

	int result;

	if ((result = usb_register(&flexcop_usb_driver))) {

		err("usb_register failed. (%d)", result);

		return result;

	}

	return 0;

}



static void __exit flexcop_usb_module_exit(void)

{

	/* deregister this driver from the USB subsystem */

	usb_deregister(&flexcop_usb_driver);

}



module_init(flexcop_usb_module_init);

module_exit(flexcop_usb_module_exit);

module_usb_driver(flexcop_usb_driver);



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_NAME);

drivers/media/dvb/dvb-usb/a800.c

+1 −20
Original line number Diff line number Diff line
@@ -183,26 +183,7 @@ static struct usb_driver a800_driver = { 
	.id_table	= a800_table,

};



/* module stuff */

static int __init a800_module_init(void)

{

	int result;

	if ((result = usb_register(&a800_driver))) {

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

		return result;

	}



	return 0;

}



static void __exit a800_module_exit(void)

{

	/* deregister this driver from the USB subsystem */

	usb_deregister(&a800_driver);

}



module_init (a800_module_init);

module_exit (a800_module_exit);

module_usb_driver(a800_driver);



MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");

MODULE_DESCRIPTION("AVerMedia AverTV DVB-T USB 2.0 (A800)");

drivers/media/dvb/dvb-usb/af9015.c

+1 −19
Original line number Diff line number Diff line
@@ -1713,25 +1713,7 @@ static struct usb_driver af9015_usb_driver = { 
	.id_table = af9015_usb_table,

};



/* module stuff */

static int __init af9015_usb_module_init(void)

{

	int ret;

	ret = usb_register(&af9015_usb_driver);

	if (ret)

		err("module init failed:%d", ret);



	return ret;

}



static void __exit af9015_usb_module_exit(void)

{

	/* deregister this driver from the USB subsystem */

	usb_deregister(&af9015_usb_driver);

}



module_init(af9015_usb_module_init);

module_exit(af9015_usb_module_exit);

module_usb_driver(af9015_usb_driver);



MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

MODULE_DESCRIPTION("Driver for Afatech AF9015 DVB-T");

drivers/media/dvb/dvb-usb/anysee.c

+1 −20
Original line number Diff line number Diff line
@@ -1091,26 +1091,7 @@ static struct usb_driver anysee_driver = { 
	.id_table   = anysee_table,

};



/* module stuff */

static int __init anysee_module_init(void)

{

	int ret;



	ret = usb_register(&anysee_driver);

	if (ret)

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



	return ret;

}



static void __exit anysee_module_exit(void)

{

	/* deregister this driver from the USB subsystem */

	usb_deregister(&anysee_driver);

}



module_init(anysee_module_init);

module_exit(anysee_module_exit);

module_usb_driver(anysee_driver);



MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

MODULE_DESCRIPTION("Driver Anysee E30 DVB-C & DVB-T USB2.0");

drivers/media/dvb/dvb-usb/au6610.c

+1 −20
Original line number Diff line number Diff line
@@ -244,26 +244,7 @@ static struct usb_driver au6610_driver = { 
	.id_table   = au6610_table,

};



/* module stuff */

static int __init au6610_module_init(void)

{

	int ret;



	ret = usb_register(&au6610_driver);

	if (ret)

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



	return ret;

}



static void __exit au6610_module_exit(void)

{

	/* deregister this driver from the USB subsystem */

	usb_deregister(&au6610_driver);

}



module_init(au6610_module_init);

module_exit(au6610_module_exit);

module_usb_driver(au6610_driver);



MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");

MODULE_DESCRIPTION("Driver for Alcor Micro AU6610 DVB-T USB2.0");

CRA Git | Maintained and supported by SUSTech CRA and CCSE