staging: comedi: pcl818: 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/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index 7d00ae639d3885fff5715b8c7873d1ff83a1019c..000dbf841e45ced9cd2754c49f0a39605e56a374 100644 (file)
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -551,7 +551,7 @@ static void pcl818_handle_eoc(struct comedi_device *dev,
        unsigned int val;
 
        if (pcl818_ai_eoc(dev, s, NULL, 0)) {
-               comedi_error(dev, "A/D mode1/3 IRQ without DRDY!");
+               dev_err(dev->class_dev, "A/D mode1/3 IRQ without DRDY!\n");
                s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                return;
        }
@@ -608,13 +608,14 @@ static void pcl818_handle_fifo(struct comedi_device *dev,
        status = inb(dev->iobase + PCL818_FI_STATUS);
 
        if (status & 4) {
-               comedi_error(dev, "A/D mode1/3 FIFO overflow!");
+               dev_err(dev->class_dev, "A/D mode1/3 FIFO overflow!\n");
                s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                return;
        }
 
        if (status & 1) {
-               comedi_error(dev, "A/D mode1/3 FIFO interrupt without data!");
+               dev_err(dev->class_dev,
+                       "A/D mode1/3 FIFO interrupt without data!\n");
                s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
                return;
        }
@@ -682,7 +683,7 @@ static int check_channel_list(struct comedi_device *dev,
 
        /* correct channel and range number check itself comedi/range.c */
        if (n_chan < 1) {
-               comedi_error(dev, "range/channel list is empty!");
+               dev_err(dev->class_dev, "range/channel list is empty!\n");
                return 0;
        }