staging: comedi: icp_multi: 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/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index 0b8b2162b76b518d3c97a613297c005021d69b48..acc80e22311cd3f87e85f3c56788e0c1a9196257 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -420,7 +420,7 @@ static int check_channel_list(struct comedi_device *dev,
 
        /*  Check that we at least have one channel to check */
        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;
        }
        /*  Check all channels */
@@ -428,14 +428,14 @@ static int check_channel_list(struct comedi_device *dev,
                /*  Check that channel number is < maximum */
                if (CR_AREF(chanlist[i]) == AREF_DIFF) {
                        if (CR_CHAN(chanlist[i]) > (s->nchan / 2)) {
-                               comedi_error(dev,
-                                            "Incorrect differential ai ch-nr");
+                               dev_err(dev->class_dev,
+                                       "Incorrect differential ai ch-nr\n");
                                return 0;
                        }
                } else {
                        if (CR_CHAN(chanlist[i]) > s->n_chan) {
-                               comedi_error(dev,
-                                            "Incorrect ai channel number");
+                               dev_err(dev->class_dev,
+                                       "Incorrect ai channel number\n");
                                return 0;
                        }
                }