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

staging: comedi: cb_pcidas: 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 b8de3cc4
...@@ -621,7 +621,7 @@ static int caldac_8800_write(struct comedi_device *dev, unsigned int address, ...@@ -621,7 +621,7 @@ static int caldac_8800_write(struct comedi_device *dev, unsigned int address,
static const int caldac_8800_udelay = 1; static const int caldac_8800_udelay = 1;
if (address >= num_caldac_channels) { if (address >= num_caldac_channels) {
comedi_error(dev, "illegal caldac channel"); dev_err(dev->class_dev, "illegal caldac channel\n");
return -1; return -1;
} }
...@@ -773,7 +773,7 @@ static int cb_pcidas_trimpot_write(struct comedi_device *dev, ...@@ -773,7 +773,7 @@ static int cb_pcidas_trimpot_write(struct comedi_device *dev,
trimpot_8402_write(dev, channel, value); trimpot_8402_write(dev, channel, value);
break; break;
default: default:
comedi_error(dev, "driver bug?"); dev_err(dev->class_dev, "driver bug?\n");
return -1; return -1;
} }
...@@ -1249,7 +1249,7 @@ static int cb_pcidas_ao_cmd(struct comedi_device *dev, ...@@ -1249,7 +1249,7 @@ static int cb_pcidas_ao_cmd(struct comedi_device *dev,
break; break;
default: default:
spin_unlock_irqrestore(&dev->spinlock, flags); spin_unlock_irqrestore(&dev->spinlock, flags);
comedi_error(dev, "error setting dac pacer source"); dev_err(dev->class_dev, "error setting dac pacer source\n");
return -1; return -1;
} }
spin_unlock_irqrestore(&dev->spinlock, flags); spin_unlock_irqrestore(&dev->spinlock, flags);
...@@ -1300,7 +1300,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status) ...@@ -1300,7 +1300,7 @@ static void handle_ao_interrupt(struct comedi_device *dev, unsigned int status)
if (cmd->stop_src == TRIG_NONE || if (cmd->stop_src == TRIG_NONE ||
(cmd->stop_src == TRIG_COUNT (cmd->stop_src == TRIG_COUNT
&& devpriv->ao_count)) { && devpriv->ao_count)) {
comedi_error(dev, "dac fifo underflow"); dev_err(dev->class_dev, "dac fifo underflow\n");
async->events |= COMEDI_CB_ERROR; async->events |= COMEDI_CB_ERROR;
} }
async->events |= COMEDI_CB_EOA; async->events |= COMEDI_CB_EOA;
...@@ -1411,8 +1411,8 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d) ...@@ -1411,8 +1411,8 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
devpriv->control_status + INT_ADCFIFO); devpriv->control_status + INT_ADCFIFO);
spin_unlock_irqrestore(&dev->spinlock, flags); spin_unlock_irqrestore(&dev->spinlock, flags);
} else if (status & EOAI) { } else if (status & EOAI) {
comedi_error(dev, dev_err(dev->class_dev,
"bug! encountered end of acquisition interrupt?"); "bug! encountered end of acquisition interrupt?\n");
/* clear EOA interrupt latch */ /* clear EOA interrupt latch */
spin_lock_irqsave(&dev->spinlock, flags); spin_lock_irqsave(&dev->spinlock, flags);
outw(devpriv->adc_fifo_bits | EOAI, outw(devpriv->adc_fifo_bits | EOAI,
...@@ -1421,7 +1421,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d) ...@@ -1421,7 +1421,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
} }
/* check for fifo overflow */ /* check for fifo overflow */
if (status & LADFUL) { if (status & LADFUL) {
comedi_error(dev, "fifo overflow"); dev_err(dev->class_dev, "fifo overflow\n");
/* clear overflow interrupt latch */ /* clear overflow interrupt latch */
spin_lock_irqsave(&dev->spinlock, flags); spin_lock_irqsave(&dev->spinlock, flags);
outw(devpriv->adc_fifo_bits | LADFUL, outw(devpriv->adc_fifo_bits | LADFUL,
......
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