Skip to content

Commit

Permalink
staging: comedi: adv_pci1710: remove unnecessary 'valid'
Browse files Browse the repository at this point in the history
The 'valid' variable in the private data is only used in the
detach of the board to determine if the pci1710_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 12, 2012
1 parent f62608e commit 398e6f1
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ static const struct boardtype boardtypes[] = {
};

struct pci1710_private {
char valid; /* card is usable */
char neverending_ai; /* we do unlimited AI */
unsigned int CntrlReg; /* Control register */
unsigned int i8254_osc_base; /* frequence of onboard oscilator */
Expand Down Expand Up @@ -1433,8 +1432,6 @@ static int pci1710_attach_pci(struct comedi_device *dev,
subdev++;
}

devpriv->valid = 1;

dev_info(dev->class_dev, "%s attached, irq %sabled\n",
dev->board_name, dev->irq ? "en" : "dis");

Expand All @@ -1443,15 +1440,12 @@ static int pci1710_attach_pci(struct comedi_device *dev,

static void pci1710_detach(struct comedi_device *dev)
{
struct pci1710_private *devpriv = dev->private;
struct pci_dev *pcidev = comedi_to_pci_dev(dev);

if (devpriv) {
if (devpriv->valid)
pci1710_reset(dev);
if (dev->irq)
free_irq(dev->irq, dev);
}
if (dev->iobase)
pci1710_reset(dev);
if (dev->irq)
free_irq(dev->irq, dev);
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
Expand Down

0 comments on commit 398e6f1

Please sign in to comment.