diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-17 11:57:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-17 17:59:02 -0700 |
| commit | 5a96ffbe795d71347fbebac9cf29772543d22961 (patch) | |
| tree | 90e1c1fe7f617c1d4538ec5fd345cb7a3ed119a1 /drivers/staging/comedi/drivers/dt282x.c | |
| parent | 3df73e07d552051dfaf98c07f9bb818bbff08268 (diff) | |
staging: comedi: dt282x: 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/dt282x.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/dt282x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index cacb4f40bbba..5de26745783a 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -438,7 +438,8 @@ static void dt282x_munge(struct comedi_device *dev, int i; if (nbytes % 2) - comedi_error(dev, "bug! odd number of bytes from dma xfer"); + dev_err(dev->class_dev, + "bug! odd number of bytes from dma xfer\n"); for (i = 0; i < nbytes / 2; i++) { val = buf[i]; @@ -528,7 +529,7 @@ static irqreturn_t dt282x_interrupt(int irq, void *d) int handled = 0; if (!dev->attached) { - comedi_error(dev, "spurious interrupt"); + dev_err(dev->class_dev, "spurious interrupt\n"); return IRQ_HANDLED; } @@ -544,13 +545,13 @@ static irqreturn_t dt282x_interrupt(int irq, void *d) } if (adcsr & DT2821_ADCSR_ADERR) { if (devpriv->nread != 0) { - comedi_error(dev, "A/D error"); + dev_err(dev->class_dev, "A/D error\n"); s->async->events |= COMEDI_CB_ERROR; } handled = 1; } if (dacsr & DT2821_DACSR_DAERR) { - comedi_error(dev, "D/A error"); + dev_err(dev->class_dev, "D/A error\n"); s_ao->async->events |= COMEDI_CB_ERROR; handled = 1; } |