[PATCH] Staging: comedi: range: remove unnecessary sanity check

[PATCH] Staging: comedi: range: remove unnecessary sanity check

[Fred Akers]

This check is unnecessary because range_table will always be
initialized to range_unknown by comedi_device_postconfig() for
drivers that do not initialize range_table or range_table_list

Signed-off-by: Fred Akers <knivey@botops.net>
---
Apply this after first patch
 drivers/staging/comedi/range.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index c4bb13b..b684954 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,10 +143,6 @@ 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) {
-		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);
-- 
1.8.5.3

Re: [PATCH] Staging: comedi: range: remove unnecessary sanity check

[Greg KH]

On Thu, Mar 06, 2014 at 01:07:03AM -0500, Fred Akers wrote:
> This check is unnecessary because range_table will always be
> initialized to range_unknown by comedi_device_postconfig() for
> drivers that do not initialize range_table or range_table_list
> 
> Signed-off-by: Fred Akers <knivey@botops.net>
> ---
> Apply this after first patch

What "first" patch?

If you have patches that need a sequence, then send a series of patches,
all numbered, like git will export for you, so I know for sure that I've
gotten them all, and that they are in the correct order.

You don't want me to have to guess :)

Care to try again?

thanks,

greg k-h

[PATCH v2 1/2] Staging: comedi: range: tidy up comedi_check_chanlist()

[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

[PATCH v2 2/2] Staging: comedi: range: remove unnecessary sanity check

[Fred Akers]

This check is unnecessary because range_table will always be
initialized to range_unknown by comedi_device_postconfig() for
drivers that do not initialize range_table or range_table_list

Signed-off-by: Fred Akers <knivey@botops.net>
---
 drivers/staging/comedi/range.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index c4bb13b..b684954 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -143,10 +143,6 @@ 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) {
-		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);
-- 
1.8.5.3

Re: [PATCH v2 1/2] Staging: comedi: range: tidy up comedi_check_chanlist()

[Ian Abbott]

On 06/03/14 06:57, 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         )=-

Re: [PATCH v2 2/2] Staging: comedi: range: remove unnecessary sanity check

[Ian Abbott]

On 06/03/14 06:57, Fred Akers wrote:
> This check is unnecessary because range_table will always be
> initialized to range_unknown by comedi_device_postconfig() for
> drivers that do not initialize range_table or range_table_list
>
> Signed-off-by: Fred Akers <knivey@botops.net>
> ---
>   drivers/staging/comedi/range.c | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
> index c4bb13b..b684954 100644
> --- a/drivers/staging/comedi/range.c
> +++ b/drivers/staging/comedi/range.c
> @@ -143,10 +143,6 @@ 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) {
> -		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);
>

Reviewed-by: Ian Abbott <abbotti@mev.co.uk>

(Further down this `for` loop, the NULL-ness test on 
`s->range_table_list` is also technically redundant, but I think the 
code is clearer with the check left in, and is safer in a defensive way.)

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-

Re: [PATCH v2 2/2] Staging: comedi: range: remove unnecessary sanity check

[Dan Carpenter]

On Thu, Mar 06, 2014 at 01:57:19AM -0500, Fred Akers wrote:
> This check is unnecessary because range_table will always be
> initialized to range_unknown by comedi_device_postconfig() for
> drivers that do not initialize range_table or range_table_list
> 
> Signed-off-by: Fred Akers <knivey@botops.net>

Just merge these two into one patch.

regards,
dan carpenter

RE: [PATCH v2 1/2] Staging: comedi: range: tidy up comedi_check_chanlist()

[Hartley Sweeten]

On Wednesday, March 05, 2014 11:57 PM, Fred Akers wrote:
>
> Refactor this function to remove an extra indent level
>
> Signed-off-by: Fred Akers <knivey@botops.net>

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Thanks

RE: [PATCH v2 2/2] Staging: comedi: range: remove unnecessary sanity check

[Hartley Sweeten]

On Wednesday, March 05, 2014 11:57 PM, Fred Akers wrote:
> This check is unnecessary because range_table will always be
> initialized to range_unknown by comedi_device_postconfig() for
> drivers that do not initialize range_table or range_table_list
>
> Signed-off-by: Fred Akers <knivey@botops.net>

Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>

Thanks