[PATCH 05/24] Staging: comedi: fix printk issue in c6xdigio.c

From: Ravishankar Karkala Mallikarjunayya
Date: Thu Oct 20 2011 - 02:20:29 EST


This is a patch to the c6xdigio.c file that fixes up a printk warning
found by the checkpatch.pl tool
Converted embedded function names to "%s", __func__ as Joe Perches
suggested and printk to pr_<level>.
Removed unnecessary printk statements.

Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@xxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/c6xdigio.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/comedi/drivers/c6xdigio.c b/drivers/staging/comedi/drivers/c6xdigio.c
index e0ac825..a372a64 100644
--- a/drivers/staging/comedi/drivers/c6xdigio.c
+++ b/drivers/staging/comedi/drivers/c6xdigio.c
@@ -343,7 +343,7 @@ static int c6xdigio_pwmo_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
- printk("c6xdigio_pwmo_insn_read %x\n", insn->n);
+ pr_debug("%s: %x\n", __func__, insn->n);
return insn->n;
}

@@ -439,9 +439,8 @@ static int c6xdigio_attach(struct comedi_device *dev,
struct comedi_subdevice *s;

iobase = it->options[0];
- printk("comedi%d: c6xdigio: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, C6XDIGIO_SIZE, "c6xdigio")) {
- printk("comedi%d: I/O port conflict\n", dev->minor);
+ pr_err("comedi%d: I/O port conflict\n", dev->minor);
return -EIO;
}
dev->iobase = iobase;
@@ -456,9 +455,9 @@ static int c6xdigio_attach(struct comedi_device *dev,

irq = it->options[1];
if (irq > 0)
- printk("comedi%d: irq = %u ignored\n", dev->minor, irq);
+ pr_debug("comedi%d: irq = %u ignored\n", dev->minor, irq);
else if (irq == 0)
- printk("comedi%d: no irq\n", dev->minor);
+ pr_debug("comedi%d: no irq\n", dev->minor);

s = dev->subdevices + 0;
/* pwm output subdevice */
@@ -503,8 +502,6 @@ static int c6xdigio_detach(struct comedi_device *dev)
{
/* board_halt(dev); may not need this */

- printk("comedi%d: c6xdigio: remove\n", dev->minor);
-
if (dev->iobase)
release_region(dev->iobase, C6XDIGIO_SIZE);

--
1.7.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/