Skip to content

Commit

Permalink
staging: comedi: ni_daq_dio24: move comedi_driver declaration
Browse files Browse the repository at this point in the history
Move the comedi_driver declaration down in the file. This removes
the need for the forward declarations.

For aesthetic reasons, add some whitespace to the declaration.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Feb 4, 2013
1 parent 1122150 commit 25602bd
Showing 1 changed file with 10 additions and 13 deletions.
23 changes: 10 additions & 13 deletions drivers/staging/comedi/drivers/ni_daq_dio24.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ static struct pcmcia_device *pcmcia_cur_dev;

#define DIO24_SIZE 4 /* size of io region used by board */

static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it);
static void dio24_detach(struct comedi_device *dev);

enum dio24_bustype { pcmcia_bustype };

struct dio24_board_struct {
Expand Down Expand Up @@ -96,16 +93,6 @@ struct dio24_private {
int data; /* number of data points left to be taken */
};

static struct comedi_driver driver_dio24 = {
.driver_name = "ni_daq_dio24",
.module = THIS_MODULE,
.attach = dio24_attach,
.detach = dio24_detach,
.num_names = ARRAY_SIZE(dio24_boards),
.board_name = &dio24_boards[0].name,
.offset = sizeof(struct dio24_board_struct),
};

static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
struct dio24_private *devpriv;
Expand Down Expand Up @@ -184,6 +171,16 @@ static void dio24_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
};

static struct comedi_driver driver_dio24 = {
.driver_name = "ni_daq_dio24",
.module = THIS_MODULE,
.attach = dio24_attach,
.detach = dio24_detach,
.num_names = ARRAY_SIZE(dio24_boards),
.board_name = &dio24_boards[0].name,
.offset = sizeof(struct dio24_board_struct),
};

static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,
void *priv_data)
{
Expand Down

0 comments on commit 25602bd

Please sign in to comment.