staging: comedi: ni_660x: 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/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 673fa52c5cf38d4fb46587f04be569c0dca6f877..f0580568d53a6c57935b33e87565c4a1e7449341 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -710,8 +710,8 @@ static int ni_660x_request_mite_channel(struct comedi_device *dev,
                                         mite_ring(devpriv, counter));
        if (mite_chan == NULL) {
                spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
-               comedi_error(dev,
-                            "failed to reserve mite dma channel for counter.");
+               dev_err(dev->class_dev,
+                       "failed to reserve mite dma channel for counter\n");
                return -EBUSY;
        }
        mite_chan->dir = direction;
@@ -745,8 +745,8 @@ static int ni_660x_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 
        retval = ni_660x_request_mite_channel(dev, counter, COMEDI_INPUT);
        if (retval) {
-               comedi_error(dev,
-                            "no dma channel available for use by counter");
+               dev_err(dev->class_dev,
+                       "no dma channel available for use by counter\n");
                return retval;
        }
        ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);