staging: comedi: refactor rti800 driver to remove forward declarations

Move the module_init/module_exit routines and the associated
struct comedi_driver and other variables to the end of the source.
This is more typical of how other drivers are written and removes
the need for the forward declarations.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 72042b818310418d24809e6340b7dcad1a25a78c..9e082b3f969f4887a50dd2e0c2532479c8210c61 100644 (file)
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -138,39 +138,8 @@ struct rti800_board {
        int has_ao;
 };
 
-static const struct rti800_board boardtypes[] = {
-       {"rti800", 0},
-       {"rti815", 1},
-};
-
 #define this_board ((const struct rti800_board *)dev->board_ptr)
 
-static int rti800_attach(struct comedi_device *dev,
-                        struct comedi_devconfig *it);
-static int rti800_detach(struct comedi_device *dev);
-static struct comedi_driver driver_rti800 = {
-       .driver_name = "rti800",
-       .module = THIS_MODULE,
-       .attach = rti800_attach,
-       .detach = rti800_detach,
-       .num_names = ARRAY_SIZE(boardtypes),
-       .board_name = &boardtypes[0].name,
-       .offset = sizeof(struct rti800_board),
-};
-
-static int __init driver_rti800_init_module(void)
-{
-       return comedi_driver_register(&driver_rti800);
-}
-
-static void __exit driver_rti800_cleanup_module(void)
-{
-       comedi_driver_unregister(&driver_rti800);
-}
-
-module_init(driver_rti800_init_module);
-module_exit(driver_rti800_cleanup_module);
-
 static irqreturn_t rti800_interrupt(int irq, void *dev);
 
 struct rti800_private {
@@ -487,6 +456,33 @@ static int rti800_detach(struct comedi_device *dev)
        return 0;
 }
 
+static const struct rti800_board boardtypes[] = {
+       { "rti800", 0 },
+       { "rti815", 1 },
+};
+
+static struct comedi_driver driver_rti800 = {
+       .driver_name    = "rti800",
+       .module         = THIS_MODULE,
+       .attach         = rti800_attach,
+       .detach         = rti800_detach,
+       .num_names      = ARRAY_SIZE(boardtypes),
+       .board_name     = &boardtypes[0].name,
+       .offset         = sizeof(struct rti800_board),
+};
+
+static int __init driver_rti800_init_module(void)
+{
+       return comedi_driver_register(&driver_rti800);
+}
+module_init(driver_rti800_init_module);
+
+static void __exit driver_rti800_cleanup_module(void)
+{
+       comedi_driver_unregister(&driver_rti800);
+}
+module_exit(driver_rti800_cleanup_module);
+
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");
 MODULE_LICENSE("GPL");