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

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

staging: comedi: daqboard2000: remove local variable in daqboard2000_attach_pci() 



The 'pci_base' variable is only used to hold the pci_resource_start()
value used to ioremap the pci bars. Remove the local variable and just
use pci_resource_start() directly in the ioremap.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdf7c9dc

drivers/staging/comedi/drivers/daqboard2000.c

+4 −5
Original line number Diff line number Diff line
@@ -696,7 +696,6 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, 
	const struct daq200_boardtype *board;

	struct daqboard2000_private *devpriv;

	struct comedi_subdevice *s;

	resource_size_t pci_base;

	int result;



	comedi_set_hw_dev(dev, &pcidev->dev);
@@ -717,10 +716,10 @@ static int daqboard2000_attach_pci(struct comedi_device *dev, 
		return result;

	dev->iobase = 1;	/* the "detach" needs this */



	pci_base = pci_resource_start(pcidev, 0);

	devpriv->plx = ioremap(pci_base, pci_resource_len(pcidev, 0));

	pci_base = pci_resource_start(pcidev, 2);

	devpriv->daq = ioremap(pci_base, pci_resource_len(pcidev, 2));

	devpriv->plx = ioremap(pci_resource_start(pcidev, 0),

			       pci_resource_len(pcidev, 0));

	devpriv->daq = ioremap(pci_resource_start(pcidev, 2),

			       pci_resource_len(pcidev, 2));

	if (!devpriv->plx || !devpriv->daq)

		return -ENOMEM;