Skip to content

Commit

Permalink
staging: comedi: adl_pci9111: remove unnecessary 'is_valid'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent eba1627 commit 893be48
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};

Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down

0 comments on commit 893be48

Please sign in to comment.