summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-07-16 10:43:32 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-16 13:34:23 -0700
commit193725ba3f99ea1d2d8870769be231bf2c3be74a (patch)
treec7c4ea486e13a6e39c79d6c2aaf62984db9206a2
parentf9558b49dc2acabb95fb40b7486b7b41d317215e (diff)
staging: comedi: s626: checkpatch.pl cleanup (else not useful)
Fix the checkpatch.pl warning: WARNING: else is not generally useful after a break or return Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/s626.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 9da68225469e..b276ce485c5f 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