From ff697f7102cf3a88adcfa6e8b164bb7c54f9abb0 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Sun, 28 Oct 2012 06:47:26 +0900 Subject: [PATCH] --- yaml --- r: 337353 b: refs/heads/master c: 53f63dc7986ef72e5a2b1f046f1f65f484bdb51b h: refs/heads/master i: 337351: f37112f0b54eea61accde445f19d8e2425f1cb9b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1dcd301f014c..aca9ace01fc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 543a09e9cf1485a8b55f6459b28f3fbab7bb55c3 +refs/heads/master: 53f63dc7986ef72e5a2b1f046f1f65f484bdb51b diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 806523c4c464..ee9158b203c9 100644 --- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -300,7 +300,7 @@ static enum irqreturn daqp_interrupt(int irq, void *dev_id) if (status & DAQP_STATUS_DATA_LOST) { s->async->events |= COMEDI_CB_EOA | COMEDI_CB_OVERFLOW; - printk("daqp: data lost\n"); + dev_warn(dev->class_dev, "data lost\n"); daqp_ai_cancel(dev, s); break; } @@ -398,7 +398,8 @@ static int daqp_ai_insn_read(struct comedi_device *dev, && (inb(dev->iobase + DAQP_STATUS) & DAQP_STATUS_EVENTS)) ; if (!counter) { - printk("daqp: couldn't clear interrupts in status register\n"); + dev_err(dev->class_dev, + "couldn't clear interrupts in status register\n"); return -1; } @@ -824,8 +825,8 @@ static int daqp_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct comedi_subdevice *s; if (it->options[0] < 0 || it->options[0] >= MAX_DEV || !local) { - printk("comedi%d: No such daqp device %d\n", - dev->minor, it->options[0]); + dev_err(dev->class_dev, "No such daqp device %d\n", + it->options[0]); return -EIO; }