Commit 81d985a1 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c71b2e52
...@@ -1080,7 +1080,6 @@ struct ext_clock_info { ...@@ -1080,7 +1080,6 @@ struct ext_clock_info {
/* this structure is for data unique to this hardware driver. */ /* this structure is for data unique to this hardware driver. */
struct pcidas64_private { struct pcidas64_private {
/* base addresses (physical) */ /* base addresses (physical) */
resource_size_t plx9080_phys_iobase;
resource_size_t main_phys_iobase; resource_size_t main_phys_iobase;
resource_size_t dio_counter_phys_iobase; resource_size_t dio_counter_phys_iobase;
/* base addresses (ioremapped) */ /* base addresses (ioremapped) */
...@@ -4053,13 +4052,8 @@ static int auto_attach(struct comedi_device *dev, ...@@ -4053,13 +4052,8 @@ static int auto_attach(struct comedi_device *dev,
/* Initialize dev->board_name */ /* Initialize dev->board_name */
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
dev->iobase = pci_resource_start(pcidev, 2); devpriv->main_phys_iobase = pci_resource_start(pcidev, 2);
devpriv->dio_counter_phys_iobase = pci_resource_start(pcidev, 3);
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->plx9080_iobase = pci_ioremap_bar(pcidev, 0); devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0);
devpriv->main_iobase = pci_ioremap_bar(pcidev, 2); devpriv->main_iobase = pci_ioremap_bar(pcidev, 2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment