From 4287f04f4fef76ce375fc78fe508f70bd46c9b61 Mon Sep 17 00:00:00 2001 From: Nasir Abed Date: Mon, 10 Oct 2011 12:09:52 +0200 Subject: [PATCH] --- yaml --- r: 268812 b: refs/heads/master c: 0bdd2b620794f4f8bddac620b774d7fbf879dcbc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/c6xdigio.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7874fe848325..c01f1e6e60ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 289ea5249c4615f21dc01e28aefce4c995f07402 +refs/heads/master: 0bdd2b620794f4f8bddac620b774d7fbf879dcbc diff --git a/trunk/drivers/staging/comedi/drivers/c6xdigio.c b/trunk/drivers/staging/comedi/drivers/c6xdigio.c index e0ac825ea58a..11cdaf2a5aa5 100644 --- a/trunk/drivers/staging/comedi/drivers/c6xdigio.c +++ b/trunk/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); + printk(KERN_DEBUG "c6xdigio_pwmo_insn_read %x\n", insn->n); return insn->n; } @@ -439,9 +439,9 @@ 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); + printk(KERN_DEBUG "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); + printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor); return -EIO; } dev->iobase = iobase; @@ -456,9 +456,10 @@ 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); + printk(KERN_DEBUG "comedi%d: irq = %u ignored\n", + dev->minor, irq); else if (irq == 0) - printk("comedi%d: no irq\n", dev->minor); + printk(KERN_DEBUG "comedi%d: no irq\n", dev->minor); s = dev->subdevices + 0; /* pwm output subdevice */ @@ -503,7 +504,7 @@ static int c6xdigio_detach(struct comedi_device *dev) { /* board_halt(dev); may not need this */ - printk("comedi%d: c6xdigio: remove\n", dev->minor); + printk(KERN_DEBUG "comedi%d: c6xdigio: remove\n", dev->minor); if (dev->iobase) release_region(dev->iobase, C6XDIGIO_SIZE);