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
......@@ -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);
......
......@@ -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));
......
......@@ -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);
......
......@@ -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 =
......
......@@ -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,
......
......@@ -514,7 +514,6 @@ static int me_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1; /* detach needs this */
dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0),
pci_resource_len(pcidev, 0));
......
......@@ -339,7 +339,6 @@ static int ni6527_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
......
......@@ -603,7 +603,6 @@ static int ni_65xx_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
......
......@@ -1180,7 +1180,6 @@ static int ni_660x_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
ret = ni_660x_allocate_private(dev);
if (ret < 0)
......
......@@ -211,7 +211,6 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
......
......@@ -711,7 +711,6 @@ static int labpc_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
......
......@@ -1115,7 +1115,6 @@ static int nidio_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
......
......@@ -1491,7 +1491,6 @@ static int pcimio_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1;
ret = ni_alloc_private(dev);
if (ret)
......
......@@ -1286,7 +1286,6 @@ static int rtd_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1; /* the "detach" needs this */
devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2),
pci_resource_len(pcidev, 2));
......
......@@ -2676,7 +2676,6 @@ static int s626_auto_attach(struct comedi_device *dev,
ret = comedi_pci_enable(dev);
if (ret)
return ret;
dev->iobase = 1; /* detach needs this */
devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0),
pci_resource_len(pcidev, 0));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment