openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: das16: cleanup comedi_error() messages 

Some of these messages are missing the terminating '\n' and most of them
have the quoted string split across lines.

Change all of them to dev_err() messages and fix the issues.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-07-29 14:06:16 -07:00 committed by Greg Kroah-Hartman
parent 0541144e80
commit c04fc1a589
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/staging/comedi/drivers/das16.c
View File

@ -527,8 +527,8 @@ static int disable_dma_on_even(struct comedi_device *dev)
residue = get_dma_residue(devpriv->dma_chan); residue = get_dma_residue(devpriv->dma_chan);
} }
if (i == disable_limit) { if (i == disable_limit) {
comedi_error(dev, "failed to get an even dma transfer, " dev_err(dev->class_dev,
"could be trouble."); "failed to get an even dma transfer, could be trouble\n");
} }
return residue; return residue;
} }
@ -556,7 +556,7 @@ static void das16_interrupt(struct comedi_device *dev)
/* figure out how many points to read */ /* figure out how many points to read */
if (residue > devpriv->dma_transfer_size) { if (residue > devpriv->dma_transfer_size) {
comedi_error(dev, "residue > transfer size!\n"); dev_err(dev->class_dev, "residue > transfer size!\n");
async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA; async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
num_bytes = 0; num_bytes = 0;
} else } else
@ -702,16 +702,13 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s,
for (i = 1; i < cmd->chanlist_len; i++) { for (i = 1; i < cmd->chanlist_len; i++) {
if (CR_CHAN(cmd->chanlist[i]) != if (CR_CHAN(cmd->chanlist[i]) !=
(start_chan + i) % s->n_chan) { (start_chan + i) % s->n_chan) {
comedi_error(dev, dev_err(dev->class_dev,
"entries in chanlist must be " "entries in chanlist must be consecutive channels, counting upwards\n");
"consecutive channels, "
"counting upwards\n");
err++; err++;
} }
if (CR_RANGE(cmd->chanlist[i]) != gain) { if (CR_RANGE(cmd->chanlist[i]) != gain) {
comedi_error(dev, dev_err(dev->class_dev,
"entries in chanlist must all " "entries in chanlist must all have the same gain\n");
"have the same gain\n");
err++; err++;
} }
} }
@ -750,8 +747,8 @@ static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
int range; int range;
if (cmd->flags & TRIG_RT) { if (cmd->flags & TRIG_RT) {
comedi_error(dev, "isa dma transfers cannot be performed with " dev_err(dev->class_dev,
"TRIG_RT, aborting"); "isa dma transfers cannot be performed with TRIG_RT, aborting\n");
return -1; return -1;
} }