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/s526.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/s526.c')
-rw-r--r-- | drivers/staging/comedi/drivers/s526.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c index ffe4362819e2..3f86ed781d72 100644 --- a/drivers/staging/comedi/drivers/s526.c +++ b/drivers/staging/comedi/drivers/s526.c @@ -948,7 +948,7 @@ static int s526_detach(struct comedi_device *dev) return 0; } -static struct comedi_driver driver_s526 = { +static struct comedi_driver s526_driver = { .driver_name = "s526", .module = THIS_MODULE, .attach = s526_attach, @@ -957,18 +957,7 @@ static struct comedi_driver driver_s526 = { .offset = sizeof(struct s526_board), .num_names = ARRAY_SIZE(s526_boards), }; - -static int __init driver_s526_init_module(void) -{ - return comedi_driver_register(&driver_s526); -} -module_init(driver_s526_init_module); - -static void __exit driver_s526_cleanup_module(void) -{ - comedi_driver_unregister(&driver_s526); -} -module_exit(driver_s526_cleanup_module); +module_comedi_driver(s526_driver); MODULE_AUTHOR("Comedi http://www.comedi.org"); MODULE_DESCRIPTION("Comedi low-level driver"); |