leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ni_660x: remove use of comedi_error()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2014-07-17 11:57:36 -07:00 committed by Greg Kroah-Hartman
parent 770bc73dc5
commit 22bc059eb4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/ni_660x.c
View File

@ -710,8 +710,8 @@ static int ni_660x_request_mite_channel(struct comedi_device *dev,
mite_ring(devpriv, counter)); mite_ring(devpriv, counter));
if (mite_chan == NULL) { if (mite_chan == NULL) {
spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags); spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
comedi_error(dev, dev_err(dev->class_dev,
"failed to reserve mite dma channel for counter."); "failed to reserve mite dma channel for counter\n");
return -EBUSY; return -EBUSY;
} }
mite_chan->dir = direction; 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); retval = ni_660x_request_mite_channel(dev, counter, COMEDI_INPUT);
if (retval) { if (retval) {
comedi_error(dev, dev_err(dev->class_dev,
"no dma channel available for use by counter"); "no dma channel available for use by counter\n");
return retval; return retval;
} }
ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL); ni_tio_acknowledge_and_confirm(counter, NULL, NULL, NULL, NULL);