public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Bruce Humphrey <brucehum@gmail.com>
To: abbotti@mev.co.uk, fmhess@users.sourceforge.net,
	gregkh@linuxfoundation.org
Cc: hsweeten@visionengravers.com, standby24x7@gmail.com,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	Bruce Humphrey <brucehum@gmail.com>
Subject: [PATCH 1/2] Staging: Comedi: dyna_pci10xx: Replace printk with dev_info
Date: Thu, 13 Sep 2012 03:46:00 +0200	[thread overview]
Message-ID: <1347500760-4394-1-git-send-email-brucehum@gmail.com> (raw)

Replace printk(KERN_XXX with dev_info, dev_warn, dev_dbg as appropiate in dyna_pci10xx

Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.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


             reply	other threads:[~2012-09-13  1:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-13  1:46 Bruce Humphrey [this message]
2012-09-13  8:00 ` [PATCH 1/2] Staging: Comedi: dyna_pci10xx: Replace printk with dev_info Dan Carpenter
     [not found]   ` <CAGzQFLgLkqOdfQjbz3LFArEZGxwiEA4nnpLLtCHaX3w=-=RbKw@mail.gmail.com>
2012-09-13 15:27     ` Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347500760-4394-1-git-send-email-brucehum@gmail.com \
    --to=brucehum@gmail.com \
    --cc=abbotti@mev.co.uk \
    --cc=devel@driverdev.osuosl.org \
    --cc=fmhess@users.sourceforge.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=hsweeten@visionengravers.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=standby24x7@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox