[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1347500760-4394-1-git-send-email-brucehum@gmail.com>
Date: Thu, 13 Sep 2012 03:46:00 +0200
From: Bruce Humphrey <brucehum@...il.com>
To: abbotti@....co.uk, fmhess@...rs.sourceforge.net,
gregkh@...uxfoundation.org
Cc: hsweeten@...ionengravers.com, standby24x7@...il.com,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Bruce Humphrey <brucehum@...il.com>
Subject: [PATCH 1/2] Staging: Comedi: dyna_pci10xx: Replace printk with dev_info
Replace printk(KERN_XXX with dev_info, dev_warn, dev_dbg as appropiate in dyna_pci10xx
Signed-off-by: Bruce Humphrey Ventura <brucehum@...il.com>
---
drivers/staging/comedi/drivers/dyna_pci10xx.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 064be9a..bfa62d1 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -140,8 +140,7 @@ static int dyna_pci10xx_insn_read_ai(struct comedi_device *dev,
goto conv_finish;
}
data[n] = 0;
- printk(KERN_DEBUG "comedi: dyna_pci10xx: "
- "timeout reading analog input\n");
+ dev_dbg(dev->class_dev, "timeout reading analog input\n");
continue;
conv_finish:
/* mask the first 4 bits - EOC bits */
@@ -262,8 +261,7 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
int ret;
if (alloc_private(dev, sizeof(struct dyna_pci10xx_private)) < 0) {
- printk(KERN_ERR "comedi: dyna_pci10xx: "
- "failed to allocate memory!\n");
+ dev_err(dev->class_dev, "failed to allocate memory!\n");
return -ENOMEM;
}
@@ -276,14 +274,14 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
dev->irq = 0;
if (comedi_pci_enable(pcidev, DRV_NAME)) {
- printk(KERN_ERR "comedi: dyna_pci10xx: "
- "failed to enable PCI device and request regions!");
+ dev_err(dev->class_dev,
+ "failed to enable PCI device and request regions!\n");
return -EIO;
}
mutex_init(&devpriv->mutex);
- printk(KERN_INFO "comedi: dyna_pci10xx: device found!\n");
+ pr_info("comedi: dyna_pci10xx: device found!\n");
dev->iobase = pci_resource_start(pcidev, 2);
devpriv->BADR3 = pci_resource_start(pcidev, 3);
@@ -333,7 +331,7 @@ static int dyna_pci10xx_attach(struct comedi_device *dev,
s->state = 0;
s->insn_bits = dyna_pci10xx_do_insn_bits;
- printk(KERN_INFO "comedi: dyna_pci10xx: %s - device setup completed!\n",
+ dev_info(dev->class_dev, "%s - device setup completed!\n",
thisboard->name);
return 1;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists