openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2012-09-24 13:23:07 -07:00 committed by Greg Kroah-Hartman
parent 41f821d077
commit 58f4a8fce1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/s626.c
View File

@ -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)
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)
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)
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);
} }
} }