staging: comedi: usbduxfast: 'cmd->chanlist_len' was already validataed
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Mon, 10 Feb 2014 22:20:29 +0000 (15:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 Feb 2014 17:31:30 +0000 (09:31 -0800)
Remove the unnecessary check of 'cmd->chanlist_len > 0'. The (*do_cmdtest) already
validated this before the (*do_cmd) was called.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/usbduxfast.c

index 5f85c55c110931d7561aba1d265e7cb2b01967c4..4a927e44cb0a44ad0cf699660c1db18e7f8055ce 100644 (file)
@@ -514,27 +514,25 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
         */
        devpriv->ignore = PACKETS_TO_IGNORE;
 
-       if (cmd->chanlist_len > 0) {
-               gain = CR_RANGE(cmd->chanlist[0]);
-               for (i = 0; i < cmd->chanlist_len; ++i) {
-                       chan = CR_CHAN(cmd->chanlist[i]);
-                       if (chan != i) {
-                               dev_err(dev->class_dev,
-                                       "channels are not consecutive\n");
-                               up(&devpriv->sem);
-                               return -EINVAL;
-                       }
-                       if ((gain != CR_RANGE(cmd->chanlist[i]))
-                           && (cmd->chanlist_len > 3)) {
-                               dev_err(dev->class_dev,
-                                       "gain must be the same for all channels\n");
-                               up(&devpriv->sem);
-                               return -EINVAL;
-                       }
-                       if (i >= NUMCHANNELS) {
-                               dev_err(dev->class_dev, "chanlist too long\n");
-                               break;
-                       }
+       gain = CR_RANGE(cmd->chanlist[0]);
+       for (i = 0; i < cmd->chanlist_len; ++i) {
+               chan = CR_CHAN(cmd->chanlist[i]);
+               if (chan != i) {
+                       dev_err(dev->class_dev,
+                               "channels are not consecutive\n");
+                       up(&devpriv->sem);
+                       return -EINVAL;
+               }
+               if ((gain != CR_RANGE(cmd->chanlist[i]))
+                       && (cmd->chanlist_len > 3)) {
+                       dev_err(dev->class_dev,
+                               "gain must be the same for all channels\n");
+                       up(&devpriv->sem);
+                       return -EINVAL;
+               }
+               if (i >= NUMCHANNELS) {
+                       dev_err(dev->class_dev, "chanlist too long\n");
+                       break;
                }
        }
        steps = 0;