kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: comedi: ni_daq_dio24: cleanup dio24_detach

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2013-01-30 16:46:39 -07:00 committed by Greg Kroah-Hartman
parent 5316ec5453
commit 6746dc6340
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/staging/comedi/drivers/ni_daq_dio24.c
View file

@ -126,18 +126,9 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void dio24_detach(struct comedi_device *dev) static void dio24_detach(struct comedi_device *dev)
{ {
const struct dio24_board_struct *thisboard = comedi_board(dev); if (dev->subdevices)
struct comedi_subdevice *s; subdev_8255_cleanup(dev, &dev->subdevices[0]);
}
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);
};
static struct comedi_driver driver_dio24 = { static struct comedi_driver driver_dio24 = {
.driver_name = "ni_daq_dio24", .driver_name = "ni_daq_dio24",