Skip to content

Commit

Permalink
staging: comedi: ni_daq_dio24: cleanup dio24_detach
Browse files Browse the repository at this point in the history
Simplify the call to subdev_8255_cleanup() to remove the
need for a local variable.

This driver only attaches to pcmcia devices so the test for
thisboard != pcmcia_bustype will always fail. Remove the test
and the unreachable release_region().

This driver also never does a request_irq() so remove the
free_irq().

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 5316ec5 commit 6746dc6
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/staging/comedi/drivers/ni_daq_dio24.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,9 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)

static void dio24_detach(struct comedi_device *dev)
{
const struct dio24_board_struct *thisboard = comedi_board(dev);
struct comedi_subdevice *s;

if (dev->subdevices) {
s = &dev->subdevices[0];
subdev_8255_cleanup(dev, s);
}
if (thisboard->bustype != pcmcia_bustype && dev->iobase)
release_region(dev->iobase, DIO24_SIZE);
if (dev->irq)
free_irq(dev->irq, dev);
};
if (dev->subdevices)
subdev_8255_cleanup(dev, &dev->subdevices[0]);
}

static struct comedi_driver driver_dio24 = {
.driver_name = "ni_daq_dio24",
Expand Down

0 comments on commit 6746dc6

Please sign in to comment.