Skip to content

Commit

Permalink
staging: comedi: ni_65xx: move ni_65xx_driver
Browse files Browse the repository at this point in the history
Move the `struct comedi_driver ni_65xx_driver` variable further down the
function to be closer to the `module_comedi_pci_driver()` module call
and to avoid having to forward declare `ni_65xx_attach()` and
`ni_65xx_detach()`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 7e66129 commit 2927eda
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/staging/comedi/drivers/ni_65xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,7 @@ static inline unsigned Filter_Enable(unsigned port)
#define OverflowIntEnable 0x02
#define EdgeIntEnable 0x01

static int ni_65xx_attach(struct comedi_device *dev,
struct comedi_devconfig *it);
static void ni_65xx_detach(struct comedi_device *dev);
static struct comedi_driver ni_65xx_driver = {
.driver_name = "ni_65xx",
.module = THIS_MODULE,
.attach = ni_65xx_attach,
.detach = ni_65xx_detach,
};

struct ni_65xx_board {

int dev_id;
const char *name;
unsigned num_dio_ports;
Expand Down Expand Up @@ -822,6 +811,13 @@ static int ni_65xx_find_device(struct comedi_device *dev, int bus, int slot)
return -EIO;
}

static struct comedi_driver ni_65xx_driver = {
.driver_name = "ni_65xx",
.module = THIS_MODULE,
.attach = ni_65xx_attach,
.detach = ni_65xx_detach,
};

static int __devinit ni_65xx_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
Expand Down

0 comments on commit 2927eda

Please sign in to comment.