Use comedi_request_region() to request the I/O region used by this
driver.
Remove the default iobase address (0x300) that is used when the user
does not pass a base address during the "comedi_config". Comedi
legacy drivers should only attach to a specified address.
Remove the dev_err() message when the request_region() fails,
comedi_request_reqion() will output the error message if necessary.
Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
Cc: Ian Abbott <abbotti@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/das6402.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index c2f20c2..431dd22 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -284,21 +284,12 @@ static int das6402_attach(struct comedi_device *dev,
{
struct das6402_private *devpriv;
unsigned int irq;
- unsigned long iobase;
int ret;
struct comedi_subdevice *s;
- iobase = it->options[0];
- if (iobase == 0)
- iobase = 0x300;
-
- if (!request_region(iobase, DAS6402_SIZE, "das6402")) {
- dev_err(dev->class_dev, "I/O port conflict\n");
- return -EIO;
- }
- dev->iobase = iobase;
-
- /* should do a probe here */
+ ret = comedi_request_region(dev, it->options[0], DAS6402_SIZE);
+ if (ret)
+ return ret;
irq = it->options[0];
dev_dbg(dev->class_dev, "( irq = %u )\n", irq);
--
1.8.1.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
