From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 16 Jul 2014 18:22:56 +0000 (-0700)
Subject: staging: comedi: ni_mio_common: checkpatch.pl cleanup (braces not necessary)
X-Git-Tag: firefly_0821_release~176^2~3491^2~595
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a62669775f4710d5dc72a1ef1b9ea6fe5ce4a73d;p=firefly-linux-kernel-4.4.55.git

staging: comedi: ni_mio_common: checkpatch.pl cleanup (braces not necessary)

Fix the checkpatch.pl warnings:

WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement

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>
---

diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index af5ee50ef80d..f00290a93412 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -970,9 +970,8 @@ static void ni_clear_ai_fifo(struct comedi_device *dev)
 				break;
 			udelay(1);
 		}
-		if (i == timeout) {
+		if (i == timeout)
 			comedi_error(dev, "FIFO flush timeout.");
-		}
 	} else {
 		ni_stc_writew(dev, 1, ADC_FIFO_Clear);
 		if (devpriv->is_625x) {
@@ -2054,11 +2053,10 @@ static void ni_load_channelgain_list(struct comedi_device *dev,
 	}
 
 	for (i = 0; i < n_chan; i++) {
-		if (!devpriv->is_6143 && (list[i] & CR_ALT_SOURCE)) {
+		if (!devpriv->is_6143 && (list[i] & CR_ALT_SOURCE))
 			chan = devpriv->ai_calib_source;
-		} else {
+		else
 			chan = CR_CHAN(list[i]);
-		}
 		aref = CR_AREF(list[i]);
 		range = CR_RANGE(list[i]);
 		dither = ((list[i] & CR_ALT_FILTER) != 0);