From: H Hartley Sweeten Date: Thu, 17 Jul 2014 18:57:44 +0000 (-0700) Subject: staging: comedi: das08: remove use of comedi_error() X-Git-Tag: firefly_0821_release~176^2~3491^2~560 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=85f3f14e823ffaf78335fbc32febdbb0e6ce8d9f;p=firefly-linux-kernel-4.4.55.git staging: comedi: das08: 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c index 6e55ba5787b7..fcf916a80c8d 100644 --- a/drivers/staging/comedi/drivers/das08.c +++ b/drivers/staging/comedi/drivers/das08.c @@ -273,7 +273,7 @@ static int das08_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, else data[n] = (1 << 15) - (lsb | (msb & 0x7f) << 8); } else { - comedi_error(dev, "bug! unknown ai encoding"); + dev_err(dev->class_dev, "bug! unknown ai encoding\n"); return -1; } }