From: Sreya Mittal <sreyamittal5@gmail.com>
Date: Fri, 24 Feb 2017 16:00:14 +0000 (+0530)
Subject: staging: speakup: Clean up if tests
X-Git-Tag: v4.12-rc1~84^2~907
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=06f6c8d4010d074c2f163eb0e1d17ad5e5574784;p=karo-tx-linux.git

staging: speakup: Clean up if tests

Put logical continuations on the next line;
remove useless parentheses;
and line up the tests.

Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/speakup/i18n.c b/drivers/staging/speakup/i18n.c
index 56ce3862a3ea..1a3e34880ac1 100644
--- a/drivers/staging/speakup/i18n.c
+++ b/drivers/staging/speakup/i18n.c
@@ -411,8 +411,8 @@ static char *next_specifier(char *input)
 		next_percent = strchr(next_percent, '%');
 		if (next_percent) {
 			/* skip over doubled percent signs */
-			while ((next_percent[0] == '%')
-			       && (next_percent[1] == '%'))
+			while (next_percent[0] == '%' &&
+			       next_percent[1] == '%')
 				next_percent += 2;
 			if (*next_percent == '%')
 				found = 1;
@@ -549,10 +549,10 @@ ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length)
 		if (newstr) {
 			memcpy(newstr, text, length);
 			newstr[length] = '\0';
-			if ((index >= MSG_FORMATTED_START
-			&& index <= MSG_FORMATTED_END)
-				&& !fmt_validate(speakup_default_msgs[index],
-				newstr)) {
+			if (index >= MSG_FORMATTED_START &&
+			    index <= MSG_FORMATTED_END &&
+			    !fmt_validate(speakup_default_msgs[index],
+			                  newstr)) {
 				kfree(newstr);
 				return -EINVAL;
 			}