Commit 1ac53c02 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a4d5b17
...@@ -55,10 +55,6 @@ static struct pcmcia_device *pcmcia_cur_dev; ...@@ -55,10 +55,6 @@ static struct pcmcia_device *pcmcia_cur_dev;
#define DIO700_SIZE 8 /* size of io region used by board */ #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 }; enum dio700_bustype { pcmcia_bustype };
struct dio700_board { struct dio700_board {
...@@ -101,16 +97,6 @@ struct dio700_private { ...@@ -101,16 +97,6 @@ struct dio700_private {
#define devpriv ((struct dio700_private *)dev->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_SIZE 8
#define _700_DATA 0 #define _700_DATA 0
...@@ -306,6 +292,16 @@ static void dio700_detach(struct comedi_device *dev) ...@@ -306,6 +292,16 @@ static void dio700_detach(struct comedi_device *dev)
free_irq(dev->irq, 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) static void dio700_release(struct pcmcia_device *link)
{ {
dev_dbg(&link->dev, "dio700_release\n"); dev_dbg(&link->dev, "dio700_release\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment