staging: comedi: cb_pcidas64: tidy up the *phys_iobase
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 10 Apr 2013 18:28:47 +0000 (11:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Apr 2013 19:54:35 +0000 (12:54 -0700)
This driver does not use the dev->iobase so don't bother initializing
it.

The plx9080_phys_iobase is not used in the driver. Remove it from the
private data.

Tidy up the initialization of the other phy_iobase variables.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/cb_pcidas64.c

index 7599053df807627cf6099a02ab96572ae1cece18..cfcde124143df1658ab3b864a80fe8943c95445c 100644 (file)
@@ -1080,7 +1080,6 @@ struct ext_clock_info {
 /* this structure is for data unique to this hardware driver. */
 struct pcidas64_private {
        /*  base addresses (physical) */
-       resource_size_t plx9080_phys_iobase;
        resource_size_t main_phys_iobase;
        resource_size_t dio_counter_phys_iobase;
        /*  base addresses (ioremapped) */
@@ -4053,13 +4052,8 @@ static int auto_attach(struct comedi_device *dev,
        /* Initialize dev->board_name */
        dev->board_name = thisboard->name;
 
-       dev->iobase = pci_resource_start(pcidev, 2);
-
-       devpriv->plx9080_phys_iobase =
-               pci_resource_start(pcidev, 0);
-       devpriv->main_phys_iobase = dev->iobase;
-       devpriv->dio_counter_phys_iobase =
-               pci_resource_start(pcidev, 3);
+       devpriv->main_phys_iobase = pci_resource_start(pcidev, 2);
+       devpriv->dio_counter_phys_iobase = pci_resource_start(pcidev, 3);
 
        devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
        devpriv->main_iobase = pci_ioremap_bar(pcidev, 2);