Skip to content

Commit

Permalink
staging: comedi: cb_pcidas64: tidy up the *phys_iobase
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 11, 2013
1 parent c71b2e5 commit 81d985a
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/staging/comedi/drivers/cb_pcidas64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 81d985a

Please sign in to comment.