diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2013-03-15 09:15:36 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-15 12:16:31 -0400 |
commit | 84b44d08993ffe762d9a86ee2243239350b871a4 (patch) | |
tree | 97e44730c6e8049bf98945c0b0c9f11065c7a8d5 | |
parent | 00ca6884186f18a758eae37e94f7c3c0527f8f30 (diff) |
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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/daqboard2000.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/dt3000.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/gsc_hpdi.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/me_daq.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_6527.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_660x.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_670x.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_pcidio.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_pcimio.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/rtd520.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 1 |
15 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index c19e4b2004f8..cdbeb0833d0b 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c | |||
@@ -1458,7 +1458,6 @@ static int cb_pcidas_auto_attach(struct comedi_device *dev, | |||
1458 | ret = comedi_pci_enable(dev); | 1458 | ret = comedi_pci_enable(dev); |
1459 | if (ret) | 1459 | if (ret) |
1460 | return ret; | 1460 | return ret; |
1461 | dev->iobase = 1; | ||
1462 | 1461 | ||
1463 | devpriv->s5933_config = pci_resource_start(pcidev, 0); | 1462 | devpriv->s5933_config = pci_resource_start(pcidev, 0); |
1464 | devpriv->control_status = pci_resource_start(pcidev, 1); | 1463 | devpriv->control_status = pci_resource_start(pcidev, 1); |
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index 7c549eb442f8..a0ec8bd5c01d 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c | |||
@@ -712,7 +712,6 @@ static int daqboard2000_auto_attach(struct comedi_device *dev, | |||
712 | result = comedi_pci_enable(dev); | 712 | result = comedi_pci_enable(dev); |
713 | if (result) | 713 | if (result) |
714 | return result; | 714 | return result; |
715 | dev->iobase = 1; /* the "detach" needs this */ | ||
716 | 715 | ||
717 | devpriv->plx = ioremap(pci_resource_start(pcidev, 0), | 716 | devpriv->plx = ioremap(pci_resource_start(pcidev, 0), |
718 | pci_resource_len(pcidev, 0)); | 717 | pci_resource_len(pcidev, 0)); |
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index edbcd89aff9d..909656ba51b5 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c | |||
@@ -738,7 +738,6 @@ static int dt3000_auto_attach(struct comedi_device *dev, | |||
738 | ret = comedi_pci_enable(dev); | 738 | ret = comedi_pci_enable(dev); |
739 | if (ret < 0) | 739 | if (ret < 0) |
740 | return ret; | 740 | return ret; |
741 | dev->iobase = 1; /* the "detach" needs this */ | ||
742 | 741 | ||
743 | pci_base = pci_resource_start(pcidev, 0); | 742 | pci_base = pci_resource_start(pcidev, 0); |
744 | devpriv->io_addr = ioremap(pci_base, DT3000_SIZE); | 743 | devpriv->io_addr = ioremap(pci_base, DT3000_SIZE); |
diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index 16b4cc050d35..ba44d0375c20 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c | |||
@@ -502,7 +502,6 @@ static int hpdi_auto_attach(struct comedi_device *dev, | |||
502 | retval = comedi_pci_enable(dev); | 502 | retval = comedi_pci_enable(dev); |
503 | if (retval) | 503 | if (retval) |
504 | return retval; | 504 | return retval; |
505 | dev->iobase = 1; /* the "detach" needs this */ | ||
506 | pci_set_master(pcidev); | 505 | pci_set_master(pcidev); |
507 | 506 | ||
508 | devpriv->plx9080_iobase = | 507 | devpriv->plx9080_iobase = |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 36659e500f40..f21ebb536a2d 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c | |||
@@ -705,7 +705,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, | |||
705 | result = comedi_pci_enable(dev); | 705 | result = comedi_pci_enable(dev); |
706 | if (result) | 706 | if (result) |
707 | return result; | 707 | return result; |
708 | dev->iobase = 1; /* the "detach" needs this */ | ||
709 | 708 | ||
710 | devpriv->iobase = ioremap(pci_resource_start(pcidev, 0), | 709 | devpriv->iobase = ioremap(pci_resource_start(pcidev, 0), |
711 | offsetof(struct jr3_t, | 710 | offsetof(struct jr3_t, |
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index fbbac1259ebd..5df4f55dbaea 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c | |||
@@ -514,7 +514,6 @@ static int me_auto_attach(struct comedi_device *dev, | |||
514 | ret = comedi_pci_enable(dev); | 514 | ret = comedi_pci_enable(dev); |
515 | if (ret) | 515 | if (ret) |
516 | return ret; | 516 | return ret; |
517 | dev->iobase = 1; /* detach needs this */ | ||
518 | 517 | ||
519 | dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0), | 518 | dev_private->plx_regbase = ioremap(pci_resource_start(pcidev, 0), |
520 | pci_resource_len(pcidev, 0)); | 519 | pci_resource_len(pcidev, 0)); |
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index 65dd1c68721a..d10f777b7f17 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c | |||
@@ -339,7 +339,6 @@ static int ni6527_auto_attach(struct comedi_device *dev, | |||
339 | ret = comedi_pci_enable(dev); | 339 | ret = comedi_pci_enable(dev); |
340 | if (ret) | 340 | if (ret) |
341 | return ret; | 341 | return ret; |
342 | dev->iobase = 1; | ||
343 | 342 | ||
344 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 343 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
345 | if (!devpriv) | 344 | if (!devpriv) |
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index eec712e5e138..013392cfe2a1 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c | |||
@@ -603,7 +603,6 @@ static int ni_65xx_auto_attach(struct comedi_device *dev, | |||
603 | ret = comedi_pci_enable(dev); | 603 | ret = comedi_pci_enable(dev); |
604 | if (ret) | 604 | if (ret) |
605 | return ret; | 605 | return ret; |
606 | dev->iobase = 1; | ||
607 | 606 | ||
608 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 607 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
609 | if (!devpriv) | 608 | if (!devpriv) |
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 440cfd17ee3a..5cdda7fe97a7 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c | |||
@@ -1180,7 +1180,6 @@ static int ni_660x_auto_attach(struct comedi_device *dev, | |||
1180 | ret = comedi_pci_enable(dev); | 1180 | ret = comedi_pci_enable(dev); |
1181 | if (ret) | 1181 | if (ret) |
1182 | return ret; | 1182 | return ret; |
1183 | dev->iobase = 1; | ||
1184 | 1183 | ||
1185 | ret = ni_660x_allocate_private(dev); | 1184 | ret = ni_660x_allocate_private(dev); |
1186 | if (ret < 0) | 1185 | if (ret < 0) |
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 524f6cd72687..e9d486238c85 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c | |||
@@ -211,7 +211,6 @@ static int ni_670x_auto_attach(struct comedi_device *dev, | |||
211 | ret = comedi_pci_enable(dev); | 211 | ret = comedi_pci_enable(dev); |
212 | if (ret) | 212 | if (ret) |
213 | return ret; | 213 | return ret; |
214 | dev->iobase = 1; | ||
215 | 214 | ||
216 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 215 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
217 | if (!devpriv) | 216 | if (!devpriv) |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index d2edaad4ddbe..62ec39dea97d 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -711,7 +711,6 @@ static int labpc_auto_attach(struct comedi_device *dev, | |||
711 | ret = comedi_pci_enable(dev); | 711 | ret = comedi_pci_enable(dev); |
712 | if (ret) | 712 | if (ret) |
713 | return ret; | 713 | return ret; |
714 | dev->iobase = 1; | ||
715 | 714 | ||
716 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 715 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
717 | if (!devpriv) | 716 | if (!devpriv) |
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 3e3a03c49681..b5f340c186ec 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c | |||
@@ -1115,7 +1115,6 @@ static int nidio_auto_attach(struct comedi_device *dev, | |||
1115 | ret = comedi_pci_enable(dev); | 1115 | ret = comedi_pci_enable(dev); |
1116 | if (ret) | 1116 | if (ret) |
1117 | return ret; | 1117 | return ret; |
1118 | dev->iobase = 1; | ||
1119 | 1118 | ||
1120 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 1119 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
1121 | if (!devpriv) | 1120 | if (!devpriv) |
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 098c398f2bea..bc83df53872e 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c | |||
@@ -1491,7 +1491,6 @@ static int pcimio_auto_attach(struct comedi_device *dev, | |||
1491 | ret = comedi_pci_enable(dev); | 1491 | ret = comedi_pci_enable(dev); |
1492 | if (ret) | 1492 | if (ret) |
1493 | return ret; | 1493 | return ret; |
1494 | dev->iobase = 1; | ||
1495 | 1494 | ||
1496 | ret = ni_alloc_private(dev); | 1495 | ret = ni_alloc_private(dev); |
1497 | if (ret) | 1496 | if (ret) |
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index c0935d4a89c1..b1d888eb61f7 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c | |||
@@ -1286,7 +1286,6 @@ static int rtd_auto_attach(struct comedi_device *dev, | |||
1286 | ret = comedi_pci_enable(dev); | 1286 | ret = comedi_pci_enable(dev); |
1287 | if (ret) | 1287 | if (ret) |
1288 | return ret; | 1288 | return ret; |
1289 | dev->iobase = 1; /* the "detach" needs this */ | ||
1290 | 1289 | ||
1291 | devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2), | 1290 | devpriv->las0 = ioremap_nocache(pci_resource_start(pcidev, 2), |
1292 | pci_resource_len(pcidev, 2)); | 1291 | pci_resource_len(pcidev, 2)); |
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index d1560524fc14..7d009463b92d 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c | |||
@@ -2676,7 +2676,6 @@ static int s626_auto_attach(struct comedi_device *dev, | |||
2676 | ret = comedi_pci_enable(dev); | 2676 | ret = comedi_pci_enable(dev); |
2677 | if (ret) | 2677 | if (ret) |
2678 | return ret; | 2678 | return ret; |
2679 | dev->iobase = 1; /* detach needs this */ | ||
2680 | 2679 | ||
2681 | devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0), | 2680 | devpriv->base_addr = ioremap(pci_resource_start(pcidev, 0), |
2682 | pci_resource_len(pcidev, 0)); | 2681 | pci_resource_len(pcidev, 0)); |