From 578dc59f20199c854507dd5f04839ffcaf655ce3 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 31 Jul 2014 12:29:18 +0300 Subject: [PATCH] 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 Reviewed-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ni_tio.c | 12 ------------ 1 file changed, 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) 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; } -- 2.34.1