Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-26 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: Improved readability of function comedi_nsamples_left.

Browse Source 
Improve readability of comedi_nsamples_left:
a) Reduce nesting by using more return statements.
b) Declare variables scans_left and samples_left at start of function.
c) Change type of scans_Left to unsigned long long to avoid cast.

Signed-off-by: Chris Opperman <eklikeroomys@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chris Opperman 2018-06-13 19:14:35 +02:00 committed by Greg Kroah-Hartman
parent fbe1be81b2
commit 2665df5101
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/comedi/drivers.c
View File

@ -473,21 +473,21 @@ unsigned int comedi_nsamples_left(struct comedi_subdevice *s,
{ {
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
struct comedi_cmd *cmd = &async->cmd; struct comedi_cmd *cmd = &async->cmd;
unsigned long long scans_left;
unsigned long long samples_left;
if (cmd->stop_src == TRIG_COUNT) { if (cmd->stop_src != TRIG_COUNT)
unsigned int scans_left = __comedi_nscans_left(s, cmd->stop_arg); return nsamples;
unsigned int scan_pos =
comedi_bytes_to_samples(s, async->scan_progress);
unsigned long long samples_left = 0;
if (scans_left) { scans_left = __comedi_nscans_left(s, cmd->stop_arg);
samples_left = ((unsigned long long)scans_left * if (!scans_left)
cmd->scan_end_arg) - scan_pos; return 0;
}
if (samples_left < nsamples) samples_left = scans_left * cmd->scan_end_arg -
nsamples = samples_left; comedi_bytes_to_samples(s, async->scan_progress);
}
if (samples_left < nsamples)
return samples_left;
return nsamples; return nsamples;
} }
EXPORT_SYMBOL_GPL(comedi_nsamples_left); EXPORT_SYMBOL_GPL(comedi_nsamples_left);