From ef52962f7a3e96f6d87395e093cf3d0dcf41986d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 8 Apr 2013 18:15:27 -0700
Subject: [PATCH] --- yaml --- r: 363995 b: refs/heads/master c:
 62d4d5613d8b4c35555ef338ac27c3df1e36e4b4 h: refs/heads/master i:   363993:
 50d06be5701ded7ea2b264ae26653c92656f01d9   363991:
 b0182b66240a6a1078e473aea3e56db814cdd72e v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/rti800.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 51d150a4c5a9..5b5bd17af380 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f20156819fd695dde50985443b93fae11df1dd4e
+refs/heads/master: 62d4d5613d8b4c35555ef338ac27c3df1e36e4b4
diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c
index 1d8cc34e542c..fdfbf412cc73 100644
--- a/trunk/drivers/staging/comedi/drivers/rti800.c
+++ b/trunk/drivers/staging/comedi/drivers/rti800.c
@@ -309,11 +309,8 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	struct comedi_subdevice *s;
 
 	iobase = it->options[0];
-	printk(KERN_INFO "comedi%d: rti800: 0x%04lx\n", dev->minor, iobase);
-	if (!request_region(iobase, RTI800_SIZE, "rti800")) {
-		printk(KERN_WARNING "I/O port conflict\n");
+	if (!request_region(iobase, RTI800_SIZE, "rti800"))
 		return -EIO;
-	}
 	dev->iobase = iobase;
 
 	outb(0, dev->iobase + RTI800_CSR);
@@ -322,15 +319,10 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	irq = it->options[1];
 	if (irq) {
-		printk(KERN_INFO "( irq = %u )\n", irq);
 		ret = request_irq(irq, rti800_interrupt, 0, "rti800", dev);
-		if (ret < 0) {
-			printk(KERN_WARNING " Failed to allocate IRQ\n");
+		if (ret < 0)
 			return ret;
-		}
 		dev->irq = irq;
-	} else {
-		printk(KERN_INFO "( no irq )\n");
 	}
 
 	dev->board_name = board->name;