* [PATCH] Staging: comedi: range: tidy up comedi_check_chanlist()
@ 2014-03-05 8:11 Fred Akers
2014-03-05 12:17 ` Ian Abbott
0 siblings, 1 reply; 2+ messages in thread
From: Fred Akers @ 2014-03-05 8:11 UTC (permalink / raw)
To: greg, abbotti, hsweeten; +Cc: devel, linux-kernel, Fred Akers
Refactor this function to remove an extra indent level
Signed-off-by: Fred Akers <knivey@botops.net>
---
drivers/staging/comedi/range.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index 46b3da6..c4bb13b 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,29 +143,28 @@ int comedi_check_chanlist(struct comedi_subdevice *s, int n,
unsigned int chanspec;
int chan, range_len, i;
- if (s->range_table || s->range_table_list) {
- for (i = 0; i < n; i++) {
- chanspec = chanlist[i];
- chan = CR_CHAN(chanspec);
- if (s->range_table)
- range_len = s->range_table->length;
- else if (s->range_table_list && chan < s->n_chan)
- range_len = s->range_table_list[chan]->length;
- else
- range_len = 0;
- if (chan >= s->n_chan ||
- CR_RANGE(chanspec) >= range_len ||
- aref_invalid(s, chanspec)) {
- dev_warn(dev->class_dev,
- "bad chanlist[%d]=0x%08x chan=%d range length=%d\n",
- i, chanspec, chan, range_len);
- return -EINVAL;
- }
- }
- } else {
+ if (!s->range_table && !s->range_table_list) {
dev_err(dev->class_dev, "(bug) no range type list!\n");
return -EINVAL;
}
+ for (i = 0; i < n; i++) {
+ chanspec = chanlist[i];
+ chan = CR_CHAN(chanspec);
+ if (s->range_table)
+ range_len = s->range_table->length;
+ else if (s->range_table_list && chan < s->n_chan)
+ range_len = s->range_table_list[chan]->length;
+ else
+ range_len = 0;
+ if (chan >= s->n_chan ||
+ CR_RANGE(chanspec) >= range_len ||
+ aref_invalid(s, chanspec)) {
+ dev_warn(dev->class_dev,
+ "bad chanlist[%d]=0x%08x chan=%d range length=%d\n",
+ i, chanspec, chan, range_len);
+ return -EINVAL;
+ }
+ }
return 0;
}
EXPORT_SYMBOL_GPL(comedi_check_chanlist);
--
1.8.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Staging: comedi: range: tidy up comedi_check_chanlist()
2014-03-05 8:11 [PATCH] Staging: comedi: range: tidy up comedi_check_chanlist() Fred Akers
@ 2014-03-05 12:17 ` Ian Abbott
0 siblings, 0 replies; 2+ messages in thread
From: Ian Abbott @ 2014-03-05 12:17 UTC (permalink / raw)
To: Fred Akers, greg, Ian Abbott, hsweeten; +Cc: devel, linux-kernel
On 2014-03-05 08:11, Fred Akers wrote:
> Refactor this function to remove an extra indent level
>
> Signed-off-by: Fred Akers <knivey@botops.net>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-05 12:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-05 8:11 [PATCH] Staging: comedi: range: tidy up comedi_check_chanlist() Fred Akers
2014-03-05 12:17 ` Ian Abbott
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).