hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: das16m1: remove use of comedi_error() 

The comedi_error() function is just a wrapper around dev_err() that adds
the dev->driver->driver_name prefix to the message and a terminating
new-line character. The addition of the driver_name is just added noise
and some of the users of comedi_error() add unnecessary additional new-line
characters.

Use dev_err() directly instead of comedi_error() to avoid any confusion
and so that all the comedi generated kernel messages have the same format.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-07-17 11:57:43 -07:00 committed by Greg Kroah-Hartman
parent 6d65caa521
commit b07262b089
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/das16m1.c
View File

@ -460,7 +460,7 @@ static void das16m1_handler(struct comedi_device *dev, unsigned int status)
* overrun interrupts, but we might as well try */ * overrun interrupts, but we might as well try */
if (status & OVRUN) { if (status & OVRUN) {
async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
comedi_error(dev, "fifo overflow"); dev_err(dev->class_dev, "fifo overflow\n");
} }
cfc_handle_events(dev, s); cfc_handle_events(dev, s);
@ -486,7 +486,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d)
struct comedi_device *dev = d; struct comedi_device *dev = d;
if (!dev->attached) { if (!dev->attached) {
comedi_error(dev, "premature interrupt"); dev_err(dev->class_dev, "premature interrupt\n");
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* prevent race with comedi_poll() */ /* prevent race with comedi_poll() */
@ -495,7 +495,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d)
status = inb(dev->iobase + DAS16M1_CS); status = inb(dev->iobase + DAS16M1_CS);
if ((status & (IRQDATA | OVRUN)) == 0) { if ((status & (IRQDATA | OVRUN)) == 0) {
comedi_error(dev, "spurious interrupt"); dev_err(dev->class_dev, "spurious interrupt\n");
spin_unlock(&dev->spinlock); spin_unlock(&dev->spinlock);
return IRQ_NONE; return IRQ_NONE;
} }