From 4613ad2fc08f76241372a14bd6e5a1f960646f9c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 18:25:49 -0700 Subject: [PATCH] --- yaml --- r: 318048 b: refs/heads/master c: caeb2490e046909fcb2f8209b88458a147011819 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/adl_pci7296.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index d492805127f0..d73fbcabc06b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f9c5b7032df0210c464a0fbb9a93654310da54a +refs/heads/master: caeb2490e046909fcb2f8209b88458a147011819 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c b/trunk/drivers/staging/comedi/drivers/adl_pci7296.c index 58deb60f2b8c..b003ed0fb57f 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/trunk/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) @@ -82,6 +81,7 @@ static struct pci_dev *adl_pci7296_find_pci(struct comedi_device *dev, static int adl_pci7296_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + struct pci_dev *pcidev; struct comedi_subdevice *s; int ret; @@ -96,18 +96,19 @@ 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) + pcidev = adl_pci7296_find_pci(dev, it); + if (!pcidev) return -EIO; + comedi_set_hw_dev(dev, &pcidev->dev); - if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7296") < 0) { + if (comedi_pci_enable(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(pcidev, 2); printk(KERN_INFO "comedi: base addr %4lx\n", dev->iobase); /* four 8255 digital io subdevices */ @@ -139,10 +140,12 @@ static int adl_pci7296_attach(struct comedi_device *dev, static void adl_pci7296_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); } if (dev->subdevices) { subdev_8255_cleanup(dev, dev->subdevices + 0);