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

Commit 84b44d08 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove unneeded settings of `dev->iobase` 



Some PCI drivers use the "spare" `iobase` member of `struct
comedi_device` as a flag to indicate that the call to
`comedi_pci_enable()` was successful.  This is no longer necessary now
that `comedi_pci_enable()` and `comedi_pci_disable()` use the
`ioenabled` member of `struct comedi_device` themselves to keep track of
what needs to be done.

Remove the unnecessary assignments to the `iobase` member in the
relevant drivers.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00ca6884

drivers/staging/comedi/drivers/cb_pcidas.c

+0 −1
Original line number Diff line number Diff line
@@ -1458,7 +1458,6 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, 
	ret = comedi_pci_enable(dev);

	if (ret)

		return ret;

	dev->iobase = 1;



	devpriv->s5933_config = pci_resource_start(pcidev, 0);

	devpriv->control_status = pci_resource_start(pcidev, 1);

drivers/staging/comedi/drivers/daqboard2000.c

+0 −1
Original line number Diff line number Diff line
@@ -712,7 +712,6 @@ static int daqboard2000_auto_attach(struct comedi_device *dev, 
	result = comedi_pci_enable(dev);

	if (result)

		return result;

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



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

			       pci_resource_len(pcidev, 0));

drivers/staging/comedi/drivers/dt3000.c

+0 −1
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ static int dt3000_auto_attach(struct comedi_device *dev, 
	ret = comedi_pci_enable(dev);

	if (ret < 0)

		return ret;

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



	pci_base  = pci_resource_start(pcidev, 0);

	devpriv->io_addr = ioremap(pci_base, DT3000_SIZE);

drivers/staging/comedi/drivers/gsc_hpdi.c

+0 −1
Original line number Diff line number Diff line
@@ -502,7 +502,6 @@ static int hpdi_auto_attach(struct comedi_device *dev, 
	retval = comedi_pci_enable(dev);

	if (retval)

		return retval;

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

	pci_set_master(pcidev);



	devpriv->plx9080_iobase =

drivers/staging/comedi/drivers/jr3_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, 
	result = comedi_pci_enable(dev);

	if (result)

		return result;

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



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

				  offsetof(struct jr3_t,