OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: Comedi adv_pci1710: Move check forward 

Simplifies function logic by assuming that n_chan >1 if not <=1.
Removes one level of indentation.

Signed-off-by: Tomas Melin <tomas.melin@iki.fi>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Melin 2012-05-07 22:49:11 +03:00 committed by Greg Kroah-Hartman
parent 00a61d8618
commit 41d8cc1ac2
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/adv_pci1710.c
View File

@ -1161,7 +1161,9 @@ static int check_channel_list(struct comedi_device *dev,
return 0;
}
if (n_chan > 1) {
if (n_chan == 1)
return 1; /* seglen=1 */
chansegment[0] = chanlist[0]; /* first channel is every time ok */
for (i = 1, seglen = 1; i < n_chan; i++, seglen++) { /* build part of chanlist */
/* printk("%d. %d %d\n",i,CR_CHAN(chanlist[i]),CR_RANGE(chanlist[i])); */
@ -1201,9 +1203,6 @@ static int check_channel_list(struct comedi_device *dev,
return 0; /* chan/gain list is strange */
}
}
} else {
seglen = 1;
}
return seglen;
}