staging: comedi: daqboard2000: remove local variable in daqboard2000_attach_pci()
authorH Hartley Sweeten <hartleys@visionengravers.com>
Wed, 19 Sep 2012 01:50:23 +0000 (18:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Sep 2012 08:41:45 +0000 (09:41 +0100)
The 'pci_base' variable is only used to hold the pci_resource_start()
value used to ioremap the pci bars. Remove the local variable and just
use pci_resource_start() directly in the ioremap.

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>
drivers/staging/comedi/drivers/daqboard2000.c

index 69bc0e5d8eed1f20d598f1e1cb69337c5ed145ea..d13c8c5822bf4dade515d951181feed4f4bea118 100644 (file)
@@ -696,7 +696,6 @@ static int daqboard2000_attach_pci(struct comedi_device *dev,
        const struct daq200_boardtype *board;
        struct daqboard2000_private *devpriv;
        struct comedi_subdevice *s;
-       resource_size_t pci_base;
        int result;
 
        comedi_set_hw_dev(dev, &pcidev->dev);
@@ -717,10 +716,10 @@ static int daqboard2000_attach_pci(struct comedi_device *dev,
                return result;
        dev->iobase = 1;        /* the "detach" needs this */
 
-       pci_base = pci_resource_start(pcidev, 0);
-       devpriv->plx = ioremap(pci_base, pci_resource_len(pcidev, 0));
-       pci_base = pci_resource_start(pcidev, 2);
-       devpriv->daq = ioremap(pci_base, pci_resource_len(pcidev, 2));
+       devpriv->plx = ioremap(pci_resource_start(pcidev, 0),
+                              pci_resource_len(pcidev, 0));
+       devpriv->daq = ioremap(pci_resource_start(pcidev, 2),
+                              pci_resource_len(pcidev, 2));
        if (!devpriv->plx || !devpriv->daq)
                return -ENOMEM;