From 3513602502db81ec214654476b95bfe327574eb6 Mon Sep 17 00:00:00 2001
From: Ravishankar karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Date: Mon, 21 Nov 2011 16:07:04 +0530
Subject: [PATCH] --- yaml --- r: 281119 b: refs/heads/master c:
 e8f31fd312ce37950bff3295d3ec1e8e0380209f h: refs/heads/master i:   281117:
 96683a0c7f34e0a553e6e75865b9b47ec9e74695   281115:
 95b69d257103fbaeadf9f061c5dda193b4459bd8   281111:
 2bd85ac111054641efd211c4fa087a9ccda5f840   281103:
 73b0df8e4a8b002f57a38b793b6d5a7c3e6ac2fb   281087:
 b89bda3fdbb2f2a06cc8cf9598aab8a1d1415863 v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/staging/comedi/drivers/ni_pcimio.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7a798a96554c..53cf6e9f43ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25c0ca8406682e741fcc1155b1393c7fb74e2917
+refs/heads/master: e8f31fd312ce37950bff3295d3ec1e8e0380209f
diff --git a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
index 99f762d3f530..0b99d9647fb5 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1684,7 +1684,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
 	int ret;
 
-	printk("comedi%d: ni_pcimio:", dev->minor);
+	dev_info(dev->hw_dev, "comedi%d: ni_pcimio:\n", dev->minor);
 
 	ret = ni_alloc_private(dev);
 	if (ret < 0)
@@ -1694,7 +1694,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	if (ret < 0)
 		return ret;
 
-	printk(" %s", boardtype.name);
+	dev_dbg(dev->hw_dev, "%s\n", boardtype.name);
 	dev->board_name = boardtype.name;
 
 	if (boardtype.reg_type & ni_reg_m_series_mask) {
@@ -1711,7 +1711,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 	ret = mite_setup(devpriv->mite);
 	if (ret < 0) {
-		printk(" error setting up mite\n");
+		pr_warn("error setting up mite\n");
 		return ret;
 	}
 	comedi_set_hw_dev(dev, &devpriv->mite->pcidev->dev);
@@ -1739,13 +1739,13 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	dev->irq = mite_irq(devpriv->mite);
 
 	if (dev->irq == 0) {
-		printk(" unknown irq (bad)\n");
+		pr_warn("unknown irq (bad)\n");
 	} else {
-		printk(" ( irq = %u )", dev->irq);
+		pr_debug("( irq = %u )\n", dev->irq);
 		ret = request_irq(dev->irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
 				  DRV_NAME, dev);
 		if (ret < 0) {
-			printk(" irq not available\n");
+			pr_warn("irq not available\n");
 			dev->irq = 0;
 		}
 	}
@@ -1786,7 +1786,7 @@ static int pcimio_find_device(struct comedi_device *dev, int bus, int slot)
 			}
 		}
 	}
-	printk("no device found\n");
+	pr_warn("no device found\n");
 	mite_list_devices();
 	return -EIO;
 }