summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-10 18:28:47 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 19:54:35 (GMT)
commit81d985a11e9a51eb88ddea98df8d60bfdda7cafb (patch)
tree51bdc833aad13085179be781869bf1b7b39e77b6 /drivers
parentc71b2e52a0fb895ad709dbe8caec3dfd2a612c04 (diff)
downloadlinux-fsl-qoriq-81d985a11e9a51eb88ddea98df8d60bfdda7cafb.tar.xz
staging: comedi: cb_pcidas64: tidy up the *phys_iobase
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/cb_pcidas64.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 7599053..cfcde12 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -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);