]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: dt282x: remove use of comedi_error()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Thu, 17 Jul 2014 18:57:39 +0000 (11:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jul 2014 00:59:02 +0000 (17:59 -0700)
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>
drivers/staging/comedi/drivers/dt282x.c

index cacb4f40bbbac05e8b11ee91fcf1e1e08ae1065b..5de26745783a91400ab702a5771a0346ddbdf2ac 100644 (file)
@@ -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;
        }