From 72d193fe542639e376a14690aef45774436c99c3 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 23 Apr 2012 16:20:41 -0700 Subject: [PATCH] --- yaml --- r: 304449 b: refs/heads/master c: 771145262e9bbabb03bd71d34792546db0bd2813 h: refs/heads/master i: 304447: f489f02233f8b8be877a0d247180b12ec99ba862 v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/c6xdigio.c | 20 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index e8ad81fc8046..3cdd897c7493 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abae41e6438b798e046d721b6ccdd55b4a398170 +refs/heads/master: 771145262e9bbabb03bd71d34792546db0bd2813 diff --git a/trunk/drivers/staging/comedi/drivers/c6xdigio.c b/trunk/drivers/staging/comedi/drivers/c6xdigio.c index 11cdaf2a5aa5..5f7535150397 100644 --- a/trunk/drivers/staging/comedi/drivers/c6xdigio.c +++ b/trunk/drivers/staging/comedi/drivers/c6xdigio.c @@ -97,16 +97,6 @@ union encvaluetype { #define C6XDIGIO_TIME_OUT 20 -static int c6xdigio_attach(struct comedi_device *dev, - struct comedi_devconfig *it); -static int c6xdigio_detach(struct comedi_device *dev); -struct comedi_driver driver_c6xdigio = { - .driver_name = "c6xdigio", - .module = THIS_MODULE, - .attach = c6xdigio_attach, - .detach = c6xdigio_detach, -}; - static void C6X_pwmInit(unsigned long baseAddr) { int timeout = 0; @@ -518,17 +508,23 @@ static int c6xdigio_detach(struct comedi_device *dev) return 0; } +struct comedi_driver driver_c6xdigio = { + .driver_name = "c6xdigio", + .module = THIS_MODULE, + .attach = c6xdigio_attach, + .detach = c6xdigio_detach, +}; + static int __init driver_c6xdigio_init_module(void) { return comedi_driver_register(&driver_c6xdigio); } +module_init(driver_c6xdigio_init_module); static void __exit driver_c6xdigio_cleanup_module(void) { comedi_driver_unregister(&driver_c6xdigio); } - -module_init(driver_c6xdigio_init_module); module_exit(driver_c6xdigio_cleanup_module); MODULE_AUTHOR("Comedi http://www.comedi.org");