staging: comedi: ni_tio: remove some dead code
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 31 Jul 2014 09:29:18 +0000 (12:29 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Aug 2014 21:50:04 +0000 (14:50 -0700)
These conditions can never be true because "i" is always one more than
NI_660X_MAX_RTSI_CHAN after the loop.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_tio.c

index fb7b271ac2a32bc0b254089e9dffdc42b0fb284c..0525292c1d8b8975a3630020773e71398a3f075a 100644 (file)
@@ -1012,14 +1012,10 @@ static unsigned ni_660x_gate_to_generic_gate(unsigned gate)
                        if (gate == NI_660X_RTSI_GATE_SEL(i))
                                return NI_GPCT_RTSI_GATE_SELECT(i);
                }
-               if (i <= NI_660X_MAX_RTSI_CHAN)
-                       break;
                for (i = 0; i <= NI_660X_MAX_GATE_PIN; ++i) {
                        if (gate == NI_660X_PIN_GATE_SEL(i))
                                return NI_GPCT_GATE_PIN_GATE_SELECT(i);
                }
-               if (i <= NI_660X_MAX_GATE_PIN)
-                       break;
                BUG();
                break;
        }
@@ -1052,14 +1048,10 @@ static unsigned ni_m_gate_to_generic_gate(unsigned gate)
                        if (gate == NI_M_RTSI_GATE_SEL(i))
                                return NI_GPCT_RTSI_GATE_SELECT(i);
                }
-               if (i <= NI_M_MAX_RTSI_CHAN)
-                       break;
                for (i = 0; i <= NI_M_MAX_PFI_CHAN; ++i) {
                        if (gate == NI_M_PFI_GATE_SEL(i))
                                return NI_GPCT_PFI_GATE_SELECT(i);
                }
-               if (i <= NI_M_MAX_PFI_CHAN)
-                       break;
                BUG();
                break;
        }
@@ -1088,14 +1080,10 @@ static unsigned ni_660x_gate2_to_generic_gate(unsigned gate)
                        if (gate == NI_660X_RTSI_GATE2_SEL(i))
                                return NI_GPCT_RTSI_GATE_SELECT(i);
                }
-               if (i <= NI_660X_MAX_RTSI_CHAN)
-                       break;
                for (i = 0; i <= NI_660X_MAX_UP_DOWN_PIN; ++i) {
                        if (gate == NI_660X_UD_PIN_GATE2_SEL(i))
                                return NI_GPCT_UP_DOWN_PIN_GATE_SELECT(i);
                }
-               if (i <= NI_660X_MAX_UP_DOWN_PIN)
-                       break;
                BUG();
                break;
        }