staging: comedi: ni_daq_700: Move the comedi_driver variable

Move the comedi_driver variable to remove the need for the
forward declarations. Add some whitespace to the declaration
for aesthetic reasons.

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

diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index f9b0d67024fc971c003511160740ac9c99fd162a..b851e2e7db42c7fbded8e0bd917be1914c3dc6ad 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -55,10 +55,6 @@ static struct pcmcia_device *pcmcia_cur_dev;
 
 #define DIO700_SIZE 8          /*  size of io region used by board */
 
-static int dio700_attach(struct comedi_device *dev,
-                        struct comedi_devconfig *it);
-static void dio700_detach(struct comedi_device *dev);
-
 enum dio700_bustype { pcmcia_bustype };
 
 struct dio700_board {
@@ -101,16 +97,6 @@ struct dio700_private {
 
 #define devpriv ((struct dio700_private *)dev->private)
 
-static struct comedi_driver driver_dio700 = {
-       .driver_name = "ni_daq_700",
-       .module = THIS_MODULE,
-       .attach = dio700_attach,
-       .detach = dio700_detach,
-       .num_names = ARRAY_SIZE(dio700_boards),
-       .board_name = &dio700_boards[0].name,
-       .offset = sizeof(struct dio700_board),
-};
-
 #define _700_SIZE 8
 
 #define _700_DATA 0
@@ -306,6 +292,16 @@ static void dio700_detach(struct comedi_device *dev)
                free_irq(dev->irq, dev);
 };
 
+static struct comedi_driver driver_dio700 = {
+       .driver_name    = "ni_daq_700",
+       .module         = THIS_MODULE,
+       .attach         = dio700_attach,
+       .detach         = dio700_detach,
+       .board_name     = &dio700_boards[0].name,
+       .num_names      = ARRAY_SIZE(dio700_boards),
+       .offset         = sizeof(struct dio700_board),
+};
+
 static void dio700_release(struct pcmcia_device *link)
 {
        dev_dbg(&link->dev, "dio700_release\n");