diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-24 13:23:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 09:37:30 -0700 |
| commit | 58f4a8fce1d6f1e42543376c85839576992e6100 (patch) | |
| tree | 2b80c4ccdfd4d47ddb4d8b10825d875d4895fe39 | |
| parent | 41f821d07729d1c3d59d1ebebf4c57e2ffe0a37c (diff) | |
| download | blackbird-op-linux-58f4a8fce1d6f1e42543376c85839576992e6100.tar.gz blackbird-op-linux-58f4a8fce1d6f1e42543376c85839576992e6100.zip | |
staging: comedi: s626: remove 'got_regions' from private data
This variable is only used as a flag to indicate that the pci device
has been enabled and needs to be disabled in the detach. Use the
comedi_device 'iobase' for this and remove the private data variable.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 93e55c314598..12709b0bbba1 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -80,7 +80,6 @@ INSN_CONFIG instructions: struct s626_private { void __iomem *base_addr; - int got_regions; short allocatedBuf; uint8_t ai_cmd_running; /* ai_cmd is running */ uint8_t ai_continous; /* continous acquisition */ @@ -2460,7 +2459,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) ret = comedi_pci_enable(pcidev, dev->board_name); if (ret) return ret; - devpriv->got_regions = 1; + dev->iobase = 1; /* detach needs this */ resourceStart = pci_resource_start(pcidev, 0); @@ -2512,7 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) if (ret) return ret; - dev->iobase = (unsigned long)devpriv->base_addr; dev->irq = pcidev->irq; /* set up interrupt handler */ @@ -2893,7 +2891,7 @@ static void s626_detach(struct comedi_device *dev) iounmap(devpriv->base_addr); } if (pcidev) { - if (devpriv->got_regions) + if (dev->iobase) comedi_pci_disable(pcidev); } } |
