[PATCH 16/30] staging: comedi: cb_pcidio: use comedi_device pci_dev pointer

[H Hartley Sweeten]

Use the pci_dev pointer in the comedi_device struct instead of
carrying it in the private data.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/cb_pcidio.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c 
b/drivers/staging/comedi/drivers/cb_pcidio.c
index 2414d5a..a21ae2b 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -96,9 +96,6 @@ static const struct pcidio_board pcidio_boards[] = {
 struct pcidio_private {
        int data;               /*  currently unused */
 
-       /* would be useful for a PCI device */
-       struct pci_dev *pci_dev;
-
        /* used for DO readback, currently unused */
        unsigned int do_readback[4];    /* up to 4 unsigned int suffice to hold 
96 bits for PCI-DIO96 */
 
@@ -156,18 +153,18 @@ static int pcidio_attach(struct comedi_device *dev, 
struct comedi_devconfig *it)
        if (alloc_private(dev, sizeof(struct pcidio_private)) < 0)
                return -ENOMEM;
 
-       devpriv->pci_dev = pcidio_find_pci_dev(dev, it);
-       if (!devpriv->pci_dev)
+       dev->pcidev = pcidio_find_pci_dev(dev, it);
+       if (!dev->pcidev)
                return -EIO;
 
        dev->board_name = thisboard->name;
 
-       if (comedi_pci_enable(devpriv->pci_dev, thisboard->name))
+       if (comedi_pci_enable(dev->pcidev, thisboard->name))
                return -EIO;
 
        devpriv->dio_reg_base
            =
-           pci_resource_start(devpriv->pci_dev,
+           pci_resource_start(dev->pcidev,
                               thisboard->dioregs_badrindex);
 
        ret = comedi_alloc_subdevices(dev, thisboard->n_8255);
@@ -186,12 +183,10 @@ static int pcidio_attach(struct comedi_device *dev, 
struct comedi_devconfig *it)
 
 static void pcidio_detach(struct comedi_device *dev)
 {
-       if (devpriv) {
-               if (devpriv->pci_dev) {
-                       if (devpriv->dio_reg_base)
-                               comedi_pci_disable(devpriv->pci_dev);
-                       pci_dev_put(devpriv->pci_dev);
-               }
+       if (dev->pcidev) {
+               if (devpriv && devpriv->dio_reg_base)
+                       comedi_pci_disable(dev->pcidev);
+               pci_dev_put(dev->pcidev);
        }
        if (dev->subdevices) {
                int i;
-- 
1.7.11

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/