Skip to contentSkip to conversation

Staging: comedi: range: remove unnecessary sanity check

PATCH In review Fred Akers 5 participants 9 messages Mar 6, 2014 1 message not in the archive Staging

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Fred Akers

author
#1 lore raw

PATCH 1/1 Staging: comedi: range: remove unnecessary sanity check

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

---
Apply this after first patch

 drivers/staging/comedi/range.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/comedi/range.c +0 -4
index c4bb13b..b684954 100644
@@ -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);
Signature · 1 line
1.8.5.3
maintainer
#2 lore raw
Quoted 7 lines · 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

---
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

author
#3 lore raw

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

Refactor this function to remove an extra indent level

---
 drivers/staging/comedi/range.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/staging/comedi/range.c +19 -20
index 46b3da6..c4bb13b 100644
@@ -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);
Signature · 1 line
1.8.5.3
author
#6 lore raw

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

In reply to Greg KH

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

---
 drivers/staging/comedi/range.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/comedi/range.c +0 -4
index c4bb13b..b684954 100644
@@ -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);
Signature · 1 line
1.8.5.3
Reviewed-by on v2 2/2
#7 lore raw
Quoted 15 lines · 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

---
  drivers/staging/comedi/range.c | 4 ----
  1 file changed, 4 deletions(-)
drivers/staging/comedi/range.c +0 -0
index c4bb13b..b684954 100644

drivers/staging/comedi/range.c int comedi_check_chanlist(struct comedi_subdevice *s, int n, · line 148

Quoted 10 lines
drivers/staging/comedi/range.c +0 -4
@@ -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);

(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.)

Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
#8 lore raw
In reply to Fred Akers
Quoted 5 lines · 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

Just merge these two into one patch.

regards,
dan carpenter