Skip to content

Commit

Permalink
staging: comedi: addi_apci_1710: only pci bar 2 is used
Browse files Browse the repository at this point in the history
This driver used to be tied to the addi-data common code which
always saved the start address of pci bars 0, 1, 2, and 3 for
use by the driver. This driver only uses pci bar 2.

Remove all the non-used pci bars and move the saving of pci bar
2 so it occurs right after the pci device is enabled.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 14, 2013
1 parent 818f569 commit 0b33e43
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/staging/comedi/drivers/addi_apci_1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,7 @@ static int apci1710_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;

if (this_board->i_IorangeBase1)
dev->iobase = pci_resource_start(pcidev, 1);
else
dev->iobase = pci_resource_start(pcidev, 0);

devpriv->iobase = dev->iobase;
devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);

if (pcidev->irq > 0) {
ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
Expand All @@ -65,8 +56,6 @@ static int apci1710_auto_attach(struct comedi_device *dev,

i_ADDI_AttachPCI1710(dev);

devpriv->s_BoardInfos.ui_Address = pci_resource_start(pcidev, 2);

i_APCI1710_Reset(dev);
return 0;
}
Expand Down

0 comments on commit 0b33e43

Please sign in to comment.