---

yaml
---
r: 364047
b: refs/heads/master
c: 5c7fa61
h: refs/heads/master
i:
  364045: c3ef27d
  364043: 80a09ce
  364039: 314deac
  364031: c52d921
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c0bad23e5d7011d1d350080fcbda4bec525521d
+refs/heads/master: 5c7fa612f48bfdaff2b655111bf46e5636b4f687

trunk/drivers/staging/comedi/drivers/das800.c

@@ -437,33 +437,19 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	const struct das800_board *thisboard = comedi_board(dev);
 	struct das800_private *devpriv;
 	struct comedi_subdevice *s;
-	unsigned long iobase = it->options[0];
 	unsigned int irq = it->options[1];
 	unsigned long irq_flags;
 	int board;
 	int ret;
 
-	dev_info(dev->class_dev, "das800: io 0x%lx\n", iobase);
-	if (irq)
-		dev_dbg(dev->class_dev, "irq %u\n", irq);
-
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
 		return -ENOMEM;
 	dev->private = devpriv;
 
-	if (iobase == 0) {
-		dev_err(dev->class_dev,
-			"io base address required for das800\n");
-		return -EINVAL;
-	}
-
-	/* check if io addresses are available */
-	if (!request_region(iobase, DAS800_SIZE, "das800")) {
-		dev_err(dev->class_dev, "I/O port conflict\n");
-		return -EIO;
-	}
-	dev->iobase = iobase;
+	ret = comedi_request_region(dev, it->options[0], DAS800_SIZE);
+	if (ret)
+		return ret;
 
 	board = das800_probe(dev);
 	if (board < 0) {