Skip to content

Commit

Permalink
staging: comedi: cb_pcidas: fix comments in *_cmdtest functions
Browse files Browse the repository at this point in the history
Remove some cut-and-paste comments from the skel driver in the
*_cmdtest functions. Shorten some others to fix the checkpatch.pl
complaints about WARNING: line over 80 characters.

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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 55acaf2 commit 0c4ef0b
Showing 1 changed file with 6 additions and 20 deletions.
26 changes: 6 additions & 20 deletions drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -809,14 +809,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
int tmp;
int i, gain, start_chan;

/* cmdtest tests a particular command to see if it is valid.
* Using the cmdtest ioctl, a user can create a valid cmd
* and then have it executes by the cmd ioctl.
*
* cmdtest returns 1,2,3,4 or 0, depending on which tests
* the command passes. */

/* step 1: make sure trigger sources are trivially valid */
/* step 1: trigger sources are trivially valid */

tmp = cmd->start_src;
cmd->start_src &= TRIG_NOW | TRIG_EXT;
Expand Down Expand Up @@ -846,7 +839,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step 2: make sure trigger sources are unique and mutually compatible */
/* step 2: trigger sources are unique and mutually compatible */

if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT)
err++;
Expand All @@ -872,7 +865,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device *dev,
if (err)
return 2;

/* step 3: make sure arguments are trivially compatible */
/* step 3: arguments are trivially compatible */

switch (cmd->start_src) {
case TRIG_EXT:
Expand Down Expand Up @@ -1092,14 +1085,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
int err = 0;
int tmp;

/* cmdtest tests a particular command to see if it is valid.
* Using the cmdtest ioctl, a user can create a valid cmd
* and then have it executes by the cmd ioctl.
*
* cmdtest returns 1,2,3,4 or 0, depending on which tests
* the command passes. */

/* step 1: make sure trigger sources are trivially valid */
/* step 1: trigger sources are trivially valid */

tmp = cmd->start_src;
cmd->start_src &= TRIG_INT;
Expand Down Expand Up @@ -1129,7 +1115,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step 2: make sure trigger sources are unique and mutually compatible */
/* step 2: trigger sources are unique and mutually compatible */

if (cmd->scan_begin_src != TRIG_TIMER &&
cmd->scan_begin_src != TRIG_EXT)
Expand All @@ -1140,7 +1126,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device *dev,
if (err)
return 2;

/* step 3: make sure arguments are trivially compatible */
/* step 3: arguments are trivially compatible */

if (cmd->start_arg != 0) {
cmd->start_arg = 0;
Expand Down

0 comments on commit 0c4ef0b

Please sign in to comment.