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

staging: comedi: addi_apci_3120: cleanup apci3120_detach() 



This driver always tried to allocate the dma buffers so they need to
be free'd when the board is detached.

Remove the unneeded tests for the eeprom chip and bring the code
back an indent.

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 0bb482e2

drivers/staging/comedi/drivers/addi_apci_3120.c

+9 −15
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static int apci3120_attach_pci(struct comedi_device *dev, 


static void apci3120_detach(struct comedi_device *dev)

{

	const struct addi_board *this_board = comedi_board(dev);

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	struct addi_private *devpriv = dev->private;
@@ -232,8 +231,6 @@ static void apci3120_detach(struct comedi_device *dev) 
			i_APCI3120_Reset(dev);

		if (dev->irq)

			free_irq(dev->irq, dev);

		if ((this_board->pc_EepromChip == NULL) ||

		    (strcmp(this_board->pc_EepromChip, ADDIDATA_9054) != 0)) {

		if (devpriv->ul_DmaBufferVirtual[0]) {

			free_pages((unsigned long)devpriv->

				ul_DmaBufferVirtual[0],
@@ -244,9 +241,6 @@ static void apci3120_detach(struct comedi_device *dev) 
				ul_DmaBufferVirtual[1],

				devpriv->ui_DmaBufferPages[1]);

		}

		} else {

			iounmap(devpriv->dw_AiBase);

		}

	}

	if (pcidev) {

		if (dev->iobase)