Use the pci_dev pointer in the comedi_device struct instead of
carrying it in the private data.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/adl_pci7296.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index 58deb60..ef6c773 100644
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -49,7 +49,6 @@ Configuration Options:
struct adl_pci7296_private {
int data;
- struct pci_dev *pci_dev;
};
#define devpriv ((struct adl_pci7296_private *)dev->private)
@@ -96,18 +95,18 @@ static int adl_pci7296_attach(struct comedi_device *dev,
if (ret)
return ret;
- devpriv->pci_dev = adl_pci7296_find_pci(dev, it);
- if (!devpriv->pci_dev)
+ dev->pcidev = adl_pci7296_find_pci(dev, it);
+ if (!dev->pcidev)
return -EIO;
- if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7296") < 0) {
+ if (comedi_pci_enable(dev->pcidev, "adl_pci7296") < 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(dev->pcidev, 2);
printk(KERN_INFO "comedi: base addr %4lx\n", dev->iobase);
/* four 8255 digital io subdevices */
@@ -139,10 +138,10 @@ static int adl_pci7296_attach(struct comedi_device *dev,
static void adl_pci7296_detach(struct comedi_device *dev)
{
- if (devpriv && devpriv->pci_dev) {
+ if (dev->pcidev) {
if (dev->iobase)
- comedi_pci_disable(devpriv->pci_dev);
- pci_dev_put(devpriv->pci_dev);
+ comedi_pci_disable(dev->pcidev);
+ pci_dev_put(dev->pcidev);
}
if (dev->subdevices) {
subdev_8255_cleanup(dev, dev->subdevices + 0);
--
1.7.11
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
