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

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

staging: comedi: das16m1: 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 6d65caa5

drivers/staging/comedi/drivers/das16m1.c

+3 −3
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static void das16m1_handler(struct comedi_device *dev, unsigned int status) 
	 * overrun interrupts, but we might as well try */

	if (status & OVRUN) {

		async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;

		comedi_error(dev, "fifo overflow");

		dev_err(dev->class_dev, "fifo overflow\n");

	}



	cfc_handle_events(dev, s);
@@ -486,7 +486,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d) 
	struct comedi_device *dev = d;



	if (!dev->attached) {

		comedi_error(dev, "premature interrupt");

		dev_err(dev->class_dev, "premature interrupt\n");

		return IRQ_HANDLED;

	}

	/*  prevent race with comedi_poll() */
@@ -495,7 +495,7 @@ static irqreturn_t das16m1_interrupt(int irq, void *d) 
	status = inb(dev->iobase + DAS16M1_CS);



	if ((status & (IRQDATA | OVRUN)) == 0) {

		comedi_error(dev, "spurious interrupt");

		dev_err(dev->class_dev, "spurious interrupt\n");

		spin_unlock(&dev->spinlock);

		return IRQ_NONE;

	}