lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: comedi: gsc_hpdi: cleanup step 3 of me4000_ai_do_cmd_test()

Browse Source 
Remove the dev_err() noise and convert the error handling to the
normal form (err |= -EINVAL) used in the do_cmdtest functions.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-11-13 17:56:11 -07:00 committed by Greg Kroah-Hartman
parent bf1b2022ef
commit 8c6c5a692d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/comedi/drivers/me4000.c
View File

@ -969,28 +969,23 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev,
if (err)
return 2;
/*
* Stage 3. Check if arguments are generally valid.
*/
/* Step 3: check if arguments are trivially valid */
if (cmd->chanlist_len < 1) {
dev_err(dev->class_dev, "No channel list\n");
cmd->chanlist_len = 1;
err++;
err |= -EINVAL;
}
if (init_ticks < 66) {
dev_err(dev->class_dev, "Start arg to low\n");
cmd->start_arg = 2000;
err++;
err |= -EINVAL;
}
if (scan_ticks && scan_ticks < 67) {
dev_err(dev->class_dev, "Scan begin arg to low\n");
cmd->scan_begin_arg = 2031;
err++;
err |= -EINVAL;
}
if (chan_ticks < 66) {
dev_err(dev->class_dev, "Convert arg to low\n");
cmd->convert_arg = 2000;
err++;
err |= -EINVAL;
}
if (err)