staging: comedi: das800: move module_{init, exit} to end of file
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 23 Apr 2013 01:31:47 +0000 (18:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Apr 2013 17:41:37 +0000 (10:41 -0700)
The module_comedi_driver() macro provides the module_{init.exit}
code for this driver. Move the macro call and the comedi_driver
declaration to the end of the file. This also removes the need
for the das800_attach() forward declaration.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/das800.c

index 6e37033eab5bd658dbd74867b0606ff8ade80df5..3a4041d6f5e6f8bd651705db62c841d73181bde7 100644 (file)
@@ -228,20 +228,8 @@ struct das800_private {
        volatile int do_bits;   /* digital output bits */
 };
 
-static int das800_attach(struct comedi_device *dev,
-                        struct comedi_devconfig *it);
 static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s);
 
-static struct comedi_driver driver_das800 = {
-       .driver_name = "das800",
-       .module = THIS_MODULE,
-       .attach = das800_attach,
-       .detach = comedi_legacy_detach,
-       .num_names = ARRAY_SIZE(das800_boards),
-       .board_name = &das800_boards[0].name,
-       .offset = sizeof(struct das800_board),
-};
-
 static irqreturn_t das800_interrupt(int irq, void *d);
 static void enable_das800(struct comedi_device *dev);
 static void disable_das800(struct comedi_device *dev);
@@ -329,8 +317,6 @@ static int das800_probe(struct comedi_device *dev)
        return -1;
 }
 
-module_comedi_driver(driver_das800);
-
 /* interrupt service routine */
 static irqreturn_t das800_interrupt(int irq, void *d)
 {
@@ -848,6 +834,17 @@ static int das800_set_frequency(struct comedi_device *dev)
        return 0;
 }
 
+static struct comedi_driver driver_das800 = {
+       .driver_name    = "das800",
+       .module         = THIS_MODULE,
+       .attach         = das800_attach,
+       .detach         = comedi_legacy_detach,
+       .num_names      = ARRAY_SIZE(das800_boards),
+       .board_name     = &das800_boards[0].name,
+       .offset         = sizeof(struct das800_board),
+};
+module_comedi_driver(driver_das800);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");