[PATCH v2] staging: comedi: dt282x: condition with no effect - if identical to else

From: Nicholas Mc Guire
Date: Wed Feb 04 2015 - 12:06:51 EST


The if and the else branch code are identical - so the condition has no
effect on the effective code - this patch removes the condition and the
duplicated code.

Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>
---

v2: Review notes from Ian Abbott <abbotti@xxxxxxxxx> and Hartley Sweeten
<HartleyS@xxxxxxxxxxxxxxxxxxx> confirm that the condition is not
needed and, as suggested, the misleading comment is completely removed.

Patch was only compile tested for x86_64_defconfig + CONFIG_STAGING=y
CONFIG_COMEDI=m, COMEDI_ISA_DRIVERS=y, CONFIG_COMEDI_DT282X=m

Patch is against 3.19.0-rc7 (localversion = -next-20150204)

drivers/staging/comedi/drivers/dt282x.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c
index 051dfb2..db21d21 100644
--- a/drivers/staging/comedi/drivers/dt282x.c
+++ b/drivers/staging/comedi/drivers/dt282x.c
@@ -685,14 +685,7 @@ static int dt282x_ai_cmdtest(struct comedi_device *dev,

err |= cfc_check_trigger_arg_is(&cmd->start_arg, 0);

- if (cmd->scan_begin_src == TRIG_FOLLOW) {
- /* internal trigger */
- err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
- } else {
- /* external trigger */
- /* should be level/edge, hi/lo specification here */
- err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);
- }
+ err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0);

err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 4000);

--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/