diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-11 02:04:57 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-11 03:08:02 (GMT) |
| commit | 893be483434a364f3a01127bdbfbdab8c5331501 (patch) | |
| tree | 6396de53dbac7364ec19563ed0df56cea45bdfb0 /drivers | |
| parent | eba16272d1e5b17788bacfb64194b79e3a6b25a3 (diff) | |
| download | linux-893be483434a364f3a01127bdbfbdab8c5331501.tar.xz | |
staging: comedi: adl_pci9111: remove unnecessary 'is_valid'
The 'is_valid' variable in the private data is only used in the
detach of the board to determine if the pci9111_reset() function
can be called. That function only requires a valid dev->iobase
to work. Use that for the check instead and remove the unneeded
variable from the private data.
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')
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci9111.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index fe55029..7cf015e 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -149,8 +149,6 @@ struct pci9111_private_data { unsigned int div1; unsigned int div2; - int is_valid; /* Is device valid */ - short ai_bounce_buffer[2 * PCI9111_FIFO_HALF_SIZE]; }; @@ -1020,8 +1018,6 @@ static int pci9111_attach_pci(struct comedi_device *dev, s->range_table = &range_digital; s->insn_bits = pci9111_do_insn_bits; - dev_private->is_valid = 1; - dev_info(dev->class_dev, "%s attached\n", dev->board_name); return 0; @@ -1030,12 +1026,9 @@ static int pci9111_attach_pci(struct comedi_device *dev, static void pci9111_detach(struct comedi_device *dev) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); - struct pci9111_private_data *dev_private = dev->private; - if (dev_private) { - if (dev_private->is_valid) - pci9111_reset(dev); - } + if (dev->iobase) + pci9111_reset(dev); if (dev->irq != 0) free_irq(dev->irq, dev); if (pcidev) { |