From e4eff325edd671f422f8f2d8531fece569f74866 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 18 Jul 2012 18:27:03 -0700 Subject: [PATCH] staging: comedi: adl_pci7432: 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adl_pci7432.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c index 10683c2..ebe022d 100644 --- a/drivers/staging/comedi/drivers/adl_pci7432.c +++ b/drivers/staging/comedi/drivers/adl_pci7432.c @@ -44,7 +44,6 @@ Configuration Options: struct adl_pci7432_private { int data; - struct pci_dev *pci_dev; }; #define devpriv ((struct adl_pci7432_private *)dev->private) @@ -110,6 +109,7 @@ static struct pci_dev *adl_pci7432_find_pci(struct comedi_device *dev, static int adl_pci7432_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + struct pci_dev *pcidev; struct comedi_subdevice *s; int ret; @@ -124,16 +124,17 @@ static int adl_pci7432_attach(struct comedi_device *dev, if (ret) return ret; - devpriv->pci_dev = adl_pci7432_find_pci(dev, it); - if (!devpriv->pci_dev) + pcidev = adl_pci7432_find_pci(dev, it); + if (!pcidev) return -EIO; + comedi_set_hw_dev(dev, &pcidev->dev); - if (comedi_pci_enable(devpriv->pci_dev, "adl_pci7432") < 0) { + if (comedi_pci_enable(pcidev, "adl_pci7432") < 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); s = dev->subdevices + 0; @@ -162,10 +163,12 @@ static int adl_pci7432_attach(struct comedi_device *dev, static void adl_pci7432_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); } } -- 2.7.4