Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b33e43a authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_apci_1710: only pci bar 2 is used 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 818f569f

drivers/staging/comedi/drivers/addi_apci_1710.c

+1 −12
Original line number Diff line number Diff line
@@ -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,
@@ -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;

}