Commit 726288e4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: ni_daq_700: Remove bustype variable from the boardinfo

This driver is only used for pcmcia type devices. There is no need for
the 'bustype' check. Remove the variable from the boardinfo and refactor
the code based on it's removal.
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 ba0333ea
...@@ -55,21 +55,16 @@ static struct pcmcia_device *pcmcia_cur_dev; ...@@ -55,21 +55,16 @@ 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 */
enum dio700_bustype { pcmcia_bustype };
struct dio700_board { struct dio700_board {
const char *name; const char *name;
enum dio700_bustype bustype; /* PCMCIA */
}; };
static const struct dio700_board dio700_boards[] = { static const struct dio700_board dio700_boards[] = {
{ {
.name = "daqcard-700", .name = "daqcard-700",
.bustype = pcmcia_bustype,
}, },
{ {
.name = "ni_daq_700", .name = "ni_daq_700",
.bustype = pcmcia_bustype,
}, },
}; };
...@@ -200,22 +195,14 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -200,22 +195,14 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct pcmcia_device *link; struct pcmcia_device *link;
int ret; int ret;
/* get base address, irq etc. based on bustype */ link = pcmcia_cur_dev; /* XXX hack */
switch (thisboard->bustype) { if (!link)
case pcmcia_bustype: return -EIO;
link = pcmcia_cur_dev; /* XXX hack */ iobase = link->resource[0]->start;
if (!link)
return -EIO;
iobase = link->resource[0]->start;
#ifdef incomplete #ifdef incomplete
irq = link->irq; irq = link->irq;
#endif #endif
break;
default:
printk(KERN_ERR "bug! couldn't determine board type\n");
return -EINVAL;
break;
}
printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor, printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor,
thisboard->name, iobase); thisboard->name, iobase);
#ifdef incomplete #ifdef incomplete
...@@ -255,8 +242,6 @@ static void dio700_detach(struct comedi_device *dev) ...@@ -255,8 +242,6 @@ static void dio700_detach(struct comedi_device *dev)
{ {
if (dev->subdevices) if (dev->subdevices)
subdev_700_cleanup(dev, dev->subdevices + 0); subdev_700_cleanup(dev, dev->subdevices + 0);
if (thisboard->bustype != pcmcia_bustype && dev->iobase)
release_region(dev->iobase, DIO700_SIZE);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}; };
......
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