Commit 58f4a8fc authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41f821d0
...@@ -80,7 +80,6 @@ INSN_CONFIG instructions: ...@@ -80,7 +80,6 @@ INSN_CONFIG instructions:
struct s626_private { struct s626_private {
void __iomem *base_addr; void __iomem *base_addr;
int got_regions;
short allocatedBuf; short allocatedBuf;
uint8_t ai_cmd_running; /* ai_cmd is running */ uint8_t ai_cmd_running; /* ai_cmd is running */
uint8_t ai_continous; /* continous acquisition */ uint8_t ai_continous; /* continous acquisition */
...@@ -2460,7 +2459,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) ...@@ -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); ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret) if (ret)
return ret; return ret;
devpriv->got_regions = 1; dev->iobase = 1; /* detach needs this */
resourceStart = pci_resource_start(pcidev, 0); resourceStart = pci_resource_start(pcidev, 0);
...@@ -2512,7 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) ...@@ -2512,7 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
if (ret) if (ret)
return ret; return ret;
dev->iobase = (unsigned long)devpriv->base_addr;
dev->irq = pcidev->irq; dev->irq = pcidev->irq;
/* set up interrupt handler */ /* set up interrupt handler */
...@@ -2893,7 +2891,7 @@ static void s626_detach(struct comedi_device *dev) ...@@ -2893,7 +2891,7 @@ static void s626_detach(struct comedi_device *dev)
iounmap(devpriv->base_addr); iounmap(devpriv->base_addr);
} }
if (pcidev) { if (pcidev) {
if (devpriv->got_regions) if (dev->iobase)
comedi_pci_disable(pcidev); comedi_pci_disable(pcidev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment