[PATCH 12/30] staging: comedi: adl_pci9118: 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/adl_pci9118.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c 
b/drivers/staging/comedi/drivers/adl_pci9118.c
index 4482aab..deda411 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -250,7 +250,6 @@ struct boardtype {
 struct pci9118_private {
        unsigned long iobase_a; /* base+size for AMCC chip */
        unsigned int master;    /* master capable */
-       struct pci_dev *pcidev; /* ptr to actual pcidev */
        unsigned int usemux;    /* we want to use external multiplexor! */
 #ifdef PCI9118_PARANOIDCHECK
        unsigned short chanlist[PCI9118_CHANLEN + 1];   /*
@@ -2170,16 +2169,16 @@ static int pci9118_attach(struct comedi_device *dev,
                return -ENOMEM;
        }
 
-       devpriv->pcidev = pci9118_find_pci(dev, it);
-       if (!devpriv->pcidev)
+       dev->pcidev = pci9118_find_pci(dev, it);
+       if (!dev->pcidev)
                return -EIO;
 
        if (master)
-               pci_set_master(devpriv->pcidev);
+               pci_set_master(dev->pcidev);
 
-       irq = devpriv->pcidev->irq;
-       devpriv->iobase_a = pci_resource_start(devpriv->pcidev, 0);
-       dev->iobase = pci_resource_start(devpriv->pcidev, 2);
+       irq = dev->pcidev->irq;
+       devpriv->iobase_a = pci_resource_start(dev->pcidev, 0);
+       dev->iobase = pci_resource_start(dev->pcidev, 2);
 
        dev->board_name = this_board->name;
 
@@ -2264,8 +2263,8 @@ static int pci9118_attach(struct comedi_device *dev,
 
        printk(".\n");
 
-       pci_read_config_word(devpriv->pcidev, PCI_COMMAND, &u16w);
-       pci_write_config_word(devpriv->pcidev, PCI_COMMAND, u16w | 64);
+       pci_read_config_word(dev->pcidev, PCI_COMMAND, &u16w);
+       pci_write_config_word(dev->pcidev, PCI_COMMAND, u16w | 64);
                                /* Enable parity check for parity error */
 
        ret = comedi_alloc_subdevices(dev, 4);
@@ -2348,11 +2347,11 @@ static void pci9118_detach(struct comedi_device *dev)
                        pci9118_reset(dev);
                if (dev->irq)
                        free_irq(dev->irq, dev);
-               if (devpriv->pcidev) {
+               if (dev->pcidev) {
                        if (dev->iobase)
-                               comedi_pci_disable(devpriv->pcidev);
+                               comedi_pci_disable(dev->pcidev);
 
-                       pci_dev_put(devpriv->pcidev);
+                       pci_dev_put(dev->pcidev);
                }
                if (devpriv->dmabuf_virt[0])
                        free_pages((unsigned long)devpriv->dmabuf_virt[0],
-- 
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/