Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6746dc63 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_daq_dio24: cleanup dio24_detach 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5316ec54

drivers/staging/comedi/drivers/ni_daq_dio24.c

+3 −12
Original line number Diff line number Diff line
@@ -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 (dev->subdevices)

		subdev_8255_cleanup(dev, &dev->subdevices[0]);

}

	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 = {

	.driver_name	= "ni_daq_dio24",