diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-13 20:46:19 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 23:12:54 (GMT) |
| commit | 87722a7ab74f2f9d89dcd45955a1c1d304e5e1c6 (patch) | |
| tree | cbb2fa0e6c1364d34dde1df4c4124bace1b54463 /drivers/staging/comedi | |
| parent | 9138de6b6befaae36b1074ce01c37517aceda061 (diff) | |
| download | linux-fsl-qoriq-87722a7ab74f2f9d89dcd45955a1c1d304e5e1c6.tar.xz | |
staging: comedi: addi_apci_1516: cleanup apci1516_detach()
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>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_1516.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c index 85ecd1a..ac99774 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1516.c +++ b/drivers/staging/comedi/drivers/addi_apci_1516.c @@ -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); } } |