staging: comedi: dt3000: remove 'phys_addr' from the private data

The 'phys_addr' variable in the private data is simply used as
a flag for the detach function to know that the pci device has
been enabled. Use the 'dev->iobase' variable instead as is more
typical for other comedi pci drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 92558e7495f72e360ed47284ebe5025629689bc9..3937e87963ed0001e2f23414d505279c57652662 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -250,7 +250,6 @@ static const struct dt3k_boardtype dt3k_boardtypes[] = {
 struct dt3k_private {
 
        struct pci_dev *pci_dev;
-       resource_size_t phys_addr;
        void __iomem *io_addr;
        unsigned int lock;
        unsigned int ao_readback[2];
@@ -824,8 +823,8 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (ret < 0)
                return ret;
 
-       devpriv->phys_addr = pci_resource_start(pcidev, 0);
-       devpriv->io_addr = ioremap(devpriv->phys_addr, DT3000_SIZE);
+       dev->iobase = pci_resource_start(pcidev, 0);
+       devpriv->io_addr = ioremap(dev->iobase, DT3000_SIZE);
        if (!devpriv->io_addr)
                return -ENOMEM;
 
@@ -905,7 +904,7 @@ static void dt3000_detach(struct comedi_device *dev)
                free_irq(dev->irq, dev);
        if (devpriv) {
                if (devpriv->pci_dev) {
-                       if (devpriv->phys_addr)
+                       if (dev->iobase)
                                comedi_pci_disable(devpriv->pci_dev);
                        pci_dev_put(devpriv->pci_dev);
                }