[PATCH 21/32] staging: comedi: s626: checkpatch.pl cleanup (else not useful)

H Hartley Sweeten hsweeten at visionengravers.com
Wed Jul 16 17:43:32 UTC 2014


Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregk at linuxfoundation.org>
---
 drivers/staging/comedi/drivers/s626.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 9da6822..b276ce4 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -836,10 +836,8 @@ static uint16_t s626_get_mode_b(struct comedi_device *dev,
 static uint16_t s626_get_mode(struct comedi_device *dev,
 			      unsigned int chan)
 {
-	if (chan < 3)
-		return s626_get_mode_a(dev, chan);
-	else
-		return s626_get_mode_b(dev, chan);
+	return (chan < 3) ? s626_get_mode_a(dev, chan)
+			  : s626_get_mode_b(dev, chan);
 }
 #endif
 
@@ -1047,10 +1045,8 @@ static uint16_t s626_get_enable(struct comedi_device *dev,
 {
 	uint16_t crb = s626_debi_read(dev, S626_LP_CRB(chan));
 
-	if (chan < 3)
-		return S626_GET_CRB_CLKENAB_A(crb);
-	else
-		return S626_GET_CRB_CLKENAB_B(crb);
+	return (chan < 3) ? S626_GET_CRB_CLKENAB_A(crb)
+			  : S626_GET_CRB_CLKENAB_B(crb);
 }
 #endif
 
-- 
1.9.3



More information about the devel mailing list