staging: comedi: das1800: 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>

diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index e9c24d050a26b290c654b1c8a147e77e36cde3ac..e4234292b1f77406841ace8281d87afe62c7c997 100644 (file)
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -654,7 +654,7 @@ static void das1800_ai_handler(struct comedi_device *dev)
        if (status & OVF) {
                /*  clear OVF interrupt bit */
                outb(CLEAR_INTR_MASK & ~OVF, dev->iobase + DAS1800_STATUS);
-               comedi_error(dev, "DAS1800 FIFO overflow");
+               dev_err(dev->class_dev, "FIFO overflow\n");
                async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
                cfc_handle_events(dev, s);
                return;
@@ -696,7 +696,7 @@ static irqreturn_t das1800_interrupt(int irq, void *d)
        unsigned int status;
 
        if (!dev->attached) {
-               comedi_error(dev, "premature interrupt");
+               dev_err(dev->class_dev, "premature interrupt\n");
                return IRQ_HANDLED;
        }
 
@@ -1179,7 +1179,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
                                break;
                }
                if (i == timeout) {
-                       comedi_error(dev, "timeout");
+                       dev_err(dev->class_dev, "timeout\n");
                        n = -ETIME;
                        goto exit;
                }