Commit f25a9ba2 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl818: 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 cefe9336
...@@ -551,7 +551,7 @@ static void pcl818_handle_eoc(struct comedi_device *dev, ...@@ -551,7 +551,7 @@ static void pcl818_handle_eoc(struct comedi_device *dev,
unsigned int val; unsigned int val;
if (pcl818_ai_eoc(dev, s, NULL, 0)) { if (pcl818_ai_eoc(dev, s, NULL, 0)) {
comedi_error(dev, "A/D mode1/3 IRQ without DRDY!"); dev_err(dev->class_dev, "A/D mode1/3 IRQ without DRDY!\n");
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
...@@ -608,13 +608,14 @@ static void pcl818_handle_fifo(struct comedi_device *dev, ...@@ -608,13 +608,14 @@ static void pcl818_handle_fifo(struct comedi_device *dev,
status = inb(dev->iobase + PCL818_FI_STATUS); status = inb(dev->iobase + PCL818_FI_STATUS);
if (status & 4) { if (status & 4) {
comedi_error(dev, "A/D mode1/3 FIFO overflow!"); dev_err(dev->class_dev, "A/D mode1/3 FIFO overflow!\n");
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
if (status & 1) { if (status & 1) {
comedi_error(dev, "A/D mode1/3 FIFO interrupt without data!"); dev_err(dev->class_dev,
"A/D mode1/3 FIFO interrupt without data!\n");
s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR; s->async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
return; return;
} }
...@@ -682,7 +683,7 @@ static int check_channel_list(struct comedi_device *dev, ...@@ -682,7 +683,7 @@ static int check_channel_list(struct comedi_device *dev,
/* correct channel and range number check itself comedi/range.c */ /* correct channel and range number check itself comedi/range.c */
if (n_chan < 1) { 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment