diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-07-18 18:27:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-19 16:19:40 -0700 |
| commit | 35260aa6f7fd5c404efb76ffa9b58a0b5d115dec (patch) | |
| tree | a5695f7a60a207b7f5f12fb8d6a4847d0b64c6a1 | |
| parent | 0ff9ba1b6294a2507769ab3c1b5867d3a527641e (diff) | |
staging: comedi: adl_pci8164: store the pci_dev in the comedi_device
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/adl_pci8164.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index 181137546133..94230d64d3f0 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c @@ -57,7 +57,6 @@ Configuration Options: struct adl_pci8164_private { int data; - struct pci_dev *pci_dev; }; #define devpriv ((struct adl_pci8164_private *)dev->private) @@ -251,6 +250,7 @@ static struct pci_dev *adl_pci8164_find_pci(struct comedi_device *dev, static int adl_pci8164_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + struct pci_dev *pcidev; struct comedi_subdevice *s; int ret; @@ -266,16 +266,17 @@ static int adl_pci8164_attach(struct comedi_device *dev, if (ret) return ret; - devpriv->pci_dev = adl_pci8164_find_pci(dev, it); - if (!devpriv->pci_dev) + pcidev = adl_pci8164_find_pci(dev, it); + if (!pcidev) return -EIO; + comedi_set_hw_dev(dev, &pcidev->dev); - if (comedi_pci_enable(devpriv->pci_dev, "adl_pci8164") < 0) { + if (comedi_pci_enable(pcidev, "adl_pci8164") < 0) { printk(KERN_ERR "comedi%d: Failed to enable " "PCI device and request regions\n", dev->minor); return -EIO; } - dev->iobase = pci_resource_start(devpriv->pci_dev, 2); + dev->iobase = pci_resource_start(pcidev, 2); printk(KERN_DEBUG "comedi: base addr %4lx\n", dev->iobase); s = dev->subdevices + 0; @@ -324,10 +325,12 @@ static int adl_pci8164_attach(struct comedi_device *dev, static void adl_pci8164_detach(struct comedi_device *dev) { - if (devpriv && devpriv->pci_dev) { + struct pci_dev *pcidev = comedi_to_pci_dev(dev); + + if (pcidev) { if (dev->iobase) - comedi_pci_disable(devpriv->pci_dev); - pci_dev_put(devpriv->pci_dev); + comedi_pci_disable(pcidev); + pci_dev_put(pcidev); } } |