From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751574AbaCFG57 (ORCPT ); Thu, 6 Mar 2014 01:57:59 -0500 Received: from [172.245.23.124] ([172.245.23.124]:55046 "EHLO w1-ca.frizzlehost.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750908AbaCFG56 (ORCPT ); Thu, 6 Mar 2014 01:57:58 -0500 From: Fred Akers To: greg@kroah.com, abbotti@mev.co.uk, hsweeten@visionengravers.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Fred Akers Subject: [PATCH v2 1/2] Staging: comedi: range: tidy up comedi_check_chanlist() Date: Thu, 6 Mar 2014 01:57:18 -0500 Message-Id: <1394089039-12408-1-git-send-email-knivey@botops.net> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <20140306062333.GA19862@kroah.com> References: <20140306062333.GA19862@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Refactor this function to remove an extra indent level Signed-off-by: Fred Akers --- 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