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

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

staging: comedi: icp_multi: 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 e176d78c

drivers/staging/comedi/drivers/icp_multi.c

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int check_channel_list(struct comedi_device *dev, 


	/*  Check that we at least have one channel to check */

	if (n_chan < 1) {

		comedi_error(dev, "range/channel list is empty!");

		dev_err(dev->class_dev, "range/channel list is empty!\n");

		return 0;

	}

	/*  Check all channels */
@@ -428,14 +428,14 @@ static int check_channel_list(struct comedi_device *dev, 
		/*  Check that channel number is < maximum */

		if (CR_AREF(chanlist[i]) == AREF_DIFF) {

			if (CR_CHAN(chanlist[i]) > (s->nchan / 2)) {

				comedi_error(dev,

					     "Incorrect differential ai ch-nr");

				dev_err(dev->class_dev,

					"Incorrect differential ai ch-nr\n");

				return 0;

			}

		} else {

			if (CR_CHAN(chanlist[i]) > s->n_chan) {

				comedi_error(dev,

					     "Incorrect ai channel number");

				dev_err(dev->class_dev,

					"Incorrect ai channel number\n");

				return 0;

			}

		}