Use the pci_dev pointer in the comedi_device struct instead of carrying it in the private data.
Signed-off-by: H Hartley Sweeten <[email protected]> Cc: Ian Abbott <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/staging/comedi/drivers/contec_pci_dio.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 5d78c10..805f59c 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -59,9 +59,6 @@ static const struct contec_board contec_boards[] = { struct contec_private { int data; - - struct pci_dev *pci_dev; - }; #define devpriv ((struct contec_private *)dev->private) @@ -134,18 +131,18 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (ret) return ret; - devpriv->pci_dev = contec_find_pci_dev(dev, it); - if (!devpriv->pci_dev) + dev->pcidev = contec_find_pci_dev(dev, it); + if (!dev->pcidev) return -EIO; dev->board_name = thisboard->name; - if (comedi_pci_enable(devpriv->pci_dev, "contec_pci_dio")) { + if (comedi_pci_enable(dev->pcidev, "contec_pci_dio")) { printk("error enabling PCI device and request regions!\n"); return -EIO; } - dev->iobase = pci_resource_start(devpriv->pci_dev, 0); + dev->iobase = pci_resource_start(dev->pcidev, 0); printk(" base addr %lx ", dev->iobase); s = dev->subdevices + 0; @@ -172,10 +169,10 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void contec_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); } } -- 1.7.11 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
