diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-07-31 05:29:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 17:50:04 -0400 |
commit | 578dc59f20199c854507dd5f04839ffcaf655ce3 (patch) | |
tree | 3be9653d7fead0c131729c2366a1a4d2129ef82e | |
parent | 1a4493c55594842fa75a91ba95c73056a29f25e6 (diff) |
staging: comedi: ni_tio: remove some dead code
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>
-rw-r--r-- | drivers/staging/comedi/drivers/ni_tio.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c index fb7b271ac2a3..0525292c1d8b 100644 --- a/drivers/staging/comedi/drivers/ni_tio.c +++ b/drivers/staging/comedi/drivers/ni_tio.c | |||
@@ -1012,14 +1012,10 @@ static unsigned ni_660x_gate_to_generic_gate(unsigned gate) | |||
1012 | if (gate == NI_660X_RTSI_GATE_SEL(i)) | 1012 | if (gate == NI_660X_RTSI_GATE_SEL(i)) |
1013 | return NI_GPCT_RTSI_GATE_SELECT(i); | 1013 | return NI_GPCT_RTSI_GATE_SELECT(i); |
1014 | } | 1014 | } |
1015 | if (i <= NI_660X_MAX_RTSI_CHAN) | ||
1016 | break; | ||
1017 | for (i = 0; i <= NI_660X_MAX_GATE_PIN; ++i) { | 1015 | for (i = 0; i <= NI_660X_MAX_GATE_PIN; ++i) { |
1018 | if (gate == NI_660X_PIN_GATE_SEL(i)) | 1016 | if (gate == NI_660X_PIN_GATE_SEL(i)) |
1019 | return NI_GPCT_GATE_PIN_GATE_SELECT(i); | 1017 | return NI_GPCT_GATE_PIN_GATE_SELECT(i); |
1020 | } | 1018 | } |
1021 | if (i <= NI_660X_MAX_GATE_PIN) | ||
1022 | break; | ||
1023 | BUG(); | 1019 | BUG(); |
1024 | break; | 1020 | break; |
1025 | } | 1021 | } |
@@ -1052,14 +1048,10 @@ static unsigned ni_m_gate_to_generic_gate(unsigned gate) | |||
1052 | if (gate == NI_M_RTSI_GATE_SEL(i)) | 1048 | if (gate == NI_M_RTSI_GATE_SEL(i)) |
1053 | return NI_GPCT_RTSI_GATE_SELECT(i); | 1049 | return NI_GPCT_RTSI_GATE_SELECT(i); |
1054 | } | 1050 | } |
1055 | if (i <= NI_M_MAX_RTSI_CHAN) | ||
1056 | break; | ||
1057 | for (i = 0; i <= NI_M_MAX_PFI_CHAN; ++i) { | 1051 | for (i = 0; i <= NI_M_MAX_PFI_CHAN; ++i) { |
1058 | if (gate == NI_M_PFI_GATE_SEL(i)) | 1052 | if (gate == NI_M_PFI_GATE_SEL(i)) |
1059 | return NI_GPCT_PFI_GATE_SELECT(i); | 1053 | return NI_GPCT_PFI_GATE_SELECT(i); |
1060 | } | 1054 | } |
1061 | if (i <= NI_M_MAX_PFI_CHAN) | ||
1062 | break; | ||
1063 | BUG(); | 1055 | BUG(); |
1064 | break; | 1056 | break; |
1065 | } | 1057 | } |
@@ -1088,14 +1080,10 @@ static unsigned ni_660x_gate2_to_generic_gate(unsigned gate) | |||
1088 | if (gate == NI_660X_RTSI_GATE2_SEL(i)) | 1080 | if (gate == NI_660X_RTSI_GATE2_SEL(i)) |
1089 | return NI_GPCT_RTSI_GATE_SELECT(i); | 1081 | return NI_GPCT_RTSI_GATE_SELECT(i); |
1090 | } | 1082 | } |
1091 | if (i <= NI_660X_MAX_RTSI_CHAN) | ||
1092 | break; | ||
1093 | for (i = 0; i <= NI_660X_MAX_UP_DOWN_PIN; ++i) { | 1083 | for (i = 0; i <= NI_660X_MAX_UP_DOWN_PIN; ++i) { |
1094 | if (gate == NI_660X_UD_PIN_GATE2_SEL(i)) | 1084 | if (gate == NI_660X_UD_PIN_GATE2_SEL(i)) |
1095 | return NI_GPCT_UP_DOWN_PIN_GATE_SELECT(i); | 1085 | return NI_GPCT_UP_DOWN_PIN_GATE_SELECT(i); |
1096 | } | 1086 | } |
1097 | if (i <= NI_660X_MAX_UP_DOWN_PIN) | ||
1098 | break; | ||
1099 | BUG(); | 1087 | BUG(); |
1100 | break; | 1088 | break; |
1101 | } | 1089 | } |