Skip to content

Commit

Permalink
staging: comedi: addi_apci_1516: cleanup apci1516_detach()
Browse files Browse the repository at this point in the history
This driver uses the comedi auto_config mechanism to attach to
the comedi subsystem. The dev->hw_dev is set by the core so
comedi_to_pci_dev() will always return a valid pcidev. Remove
the unnecessary test.

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 Nov 13, 2012
1 parent 9138de6 commit 87722a7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,9 @@ static void apci1516_detach(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);

if (dev->iobase)
if (dev->iobase) {
apci1516_reset(dev);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
comedi_pci_disable(pcidev);
}
}

Expand Down

0 comments on commit 87722a7

Please sign in to comment.