leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: daqboard2000: store the pci_dev in the comedi_device

Browse Source 
Use the hw_dev pointer in the comedi_device struct to hold the
pci_dev instead of carrying it in 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>
This commit is contained in:
H Hartley Sweeten 2012-07-18 18:57:08 -07:00 committed by Greg Kroah-Hartman
parent f55354b0a8
commit ad196be73d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/daqboard2000.c
View File

@ -317,7 +317,6 @@ struct daqboard2000_private {
enum { enum {
card_daqboard_2000 card_daqboard_2000
} card; } card;
struct pci_dev *pci_dev;
void *daq; void *daq;
void *plx; void *plx;
unsigned int ao_readback[2]; unsigned int ao_readback[2];
@ -751,7 +750,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
pcidev = daqboard2000_find_pci_dev(dev, it); pcidev = daqboard2000_find_pci_dev(dev, it);
if (!pcidev) if (!pcidev)
return -EIO; return -EIO;
devpriv->pci_dev = pcidev; comedi_set_hw_dev(dev, &pcidev->dev);
result = comedi_pci_enable(pcidev, "daqboard2000"); result = comedi_pci_enable(pcidev, "daqboard2000");
if (result < 0) { if (result < 0) {
@ -833,6 +832,8 @@ out:
static void daqboard2000_detach(struct comedi_device *dev) static void daqboard2000_detach(struct comedi_device *dev)
{ {
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
if (dev->subdevices) if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 2); subdev_8255_cleanup(dev, dev->subdevices + 2);
if (dev->irq) if (dev->irq)
@ -842,11 +843,11 @@ static void daqboard2000_detach(struct comedi_device *dev)
iounmap(devpriv->daq); iounmap(devpriv->daq);
if (devpriv->plx) if (devpriv->plx)
iounmap(devpriv->plx); iounmap(devpriv->plx);
if (devpriv->pci_dev) {
if (dev->iobase)
comedi_pci_disable(devpriv->pci_dev);
pci_dev_put(devpriv->pci_dev);
} }
if (pcidev) {
if (dev->iobase)
comedi_pci_disable(pcidev);
pci_dev_put(pcidev);
} }
} }