diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-05-03 15:09:40 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-09 13:31:36 -0700 |
commit | 294f930d98be86fb4f34302c718a49719650857f (patch) | |
tree | 1fbb4a6d2f97f9309bab42035934fa1c6807742e /drivers/staging/comedi/drivers/adq12b.c | |
parent | feb5680e063fd39873e9e638937f1197d38a81ca (diff) |
staging: comedi: use module_comedi_driver
Convert the refactored comedi drivers to use the module_comedi_driver()
macro which makes the code smaller and a bit simpler.
In the process, rename the driver variables from driver_* to *_driver,
as is more typical with other subsystems, and make sure they are all
static.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/adq12b.c')
-rw-r--r-- | drivers/staging/comedi/drivers/adq12b.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index 275cb771f77..6a68d5303a1 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c @@ -347,7 +347,7 @@ static const struct adq12b_board adq12b_boards[] = { }, }; -static struct comedi_driver driver_adq12b = { +static struct comedi_driver adq12b_driver = { .driver_name = "adq12b", .module = THIS_MODULE, .attach = adq12b_attach, @@ -356,18 +356,7 @@ static struct comedi_driver driver_adq12b = { .offset = sizeof(struct adq12b_board), .num_names = ARRAY_SIZE(adq12b_boards), }; - -static int __init driver_adq12b_init_module(void) -{ - return comedi_driver_register(&driver_adq12b); -} -module_init(driver_adq12b_init_module); - -static void __exit driver_adq12b_cleanup_module(void) -{ - comedi_driver_unregister(&driver_adq12b); -} -module_exit(driver_adq12b_cleanup_module); +module_comedi_driver(adq12b_driver); MODULE_AUTHOR("Comedi http://www.comedi.org"); MODULE_DESCRIPTION("Comedi low-level driver"); |