Commit d1fe2cfb authored Jul 17, 2014 by H Hartley Sweeten Committed by Greg Kroah-Hartman Jul 17, 2014

staging: comedi: adv_pci_dio: 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>

parent 12c2791b

drivers/staging/comedi/drivers/adv_pci_dio.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -592,7 +592,7 @@ static int pci1760_unchecked_mbxrequest(struct comedi_device *dev,
		return 0;
		}

		comedi_error(dev, "PCI-1760 mailbox request timeout!");
		dev_err(dev->class_dev, "PCI-1760 mailbox request timeout!\n");
		return -ETIME;
		}

		@@ -610,8 +610,8 @@ static int pci1760_mbxrequest(struct comedi_device *dev,
		unsigned char omb, unsigned char imb)
		{
		if (omb[2] == CMD_ClearIMB2) {
		comedi_error(dev,
		"bug! this function should not be used for CMD_ClearIMB2 command");
		dev_err(dev->class_dev,
		"bug! this function should not be used for CMD_ClearIMB2 command\n");
		return -EINVAL;
		}
		if (inb(dev->iobase + IMB2) == omb[2]) {