staging: comedi: hwdrv_apci1500: 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/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index a633957890d75c0e76a5ddf4f184b1554f09c5d3..1e2fe66818e41f6bd1060f7f322aca583646fd9e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -872,7 +872,8 @@ static int apci1500_do_write(struct comedi_device *dev,
                                        break;
 
                                default:
-                                       comedi_error(dev, " chan spec wrong");
+                                       dev_err(dev->class_dev,
+                                               "chan spec wrong\n");
                                        return -EINVAL; /*  "sorry channel spec wrong " */
 
                                }       /* switch(ui_NoOfChannels) */
@@ -950,8 +951,8 @@ static int apci1500_do_write(struct comedi_device *dev,
                                                break;
 
                                        default:
-                                               comedi_error(dev,
-                                                       " chan spec wrong");
+                                               dev_err(dev->class_dev,
+                                                       "chan spec wrong\n");
                                                return -EINVAL; /*  "sorry channel spec wrong " */
 
                                        }       /* switch(ui_NoOfChannels) */