Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e9607b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_pcidio: 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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73e7d412

drivers/staging/comedi/drivers/ni_pcidio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -319,7 +319,7 @@ static int ni_pcidio_request_di_mite_channel(struct comedi_device *dev) 
					  devpriv->di_mite_ring, 1, 2);

					  devpriv->di_mite_ring, 1, 2);

	if (devpriv->di_mite_chan == NULL) {

	if (devpriv->di_mite_chan == NULL) {

		spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);

		spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);

		comedi_error(dev, "failed to reserve mite dma channel.");

		dev_err(dev->class_dev, "failed to reserve mite dma channel\n");

		return -EBUSY;

		return -EBUSY;

	}

	}

	devpriv->di_mite_chan->dir = COMEDI_INPUT;

	devpriv->di_mite_chan->dir = COMEDI_INPUT;