From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 1 May 2015 21:59:13 +0000 (-0700)
Subject: staging: comedi: ni_stc.h: remove unreachable code in RTSI_Output_Bit()
X-Git-Tag: firefly_0821_release~176^2~1545^2~713
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e2bdb0d833655b09d7ae75b7ca4eafde22fda9a4;p=firefly-linux-kernel-4.4.55.git

staging: comedi: ni_stc.h: remove unreachable code in RTSI_Output_Bit()

All the callers of this function check the 'channel' number with
num_configurable_rtsi_channels(). This check can never occure.
Remove it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index e6be68cf47a0..e81caa88f5cf 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -352,10 +352,6 @@ static inline unsigned RTSI_Output_Bit(unsigned channel, int is_mseries)
 		base_bit_shift = 9;
 		max_channel = 6;
 	}
-	if (channel > max_channel) {
-		pr_err("%s: bug, invalid RTSI_channel=%i\n", __func__, channel);
-		return 0;
-	}
 	return 1 << (base_bit_shift + channel);
 }