[PATCH 1/2] staging: speakup: Clean up parentheses

[PATCH 1/2] staging: speakup: Clean up parentheses

[Sreya Mittal]

Align next line of print statements
to the right of open parentheses and
remove extra parentheses.

Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
---
 drivers/staging/speakup/keyhelp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
index ce94cb1..c373762 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -115,9 +115,9 @@ static void say_key(int key)
 		if (state & masks[i])
 			synth_printf(" %s", spk_msg_get(MSG_STATES_START + i));
 	}
-	if ((key > 0) && (key <= num_key_names))
+	if (key > 0 && key <= num_key_names)
 		synth_printf(" %s\n",
-				spk_msg_get(MSG_KEYNAMES_START + (key - 1)));
+			     spk_msg_get(MSG_KEYNAMES_START + (key - 1)));
 }
 
 static int help_init(void)
@@ -164,7 +164,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
 		cur_item = letter_offsets[ch - 'a'];
 	} else if (type == KT_CUR) {
 		if (ch == 0
-		    && (MSG_FUNCNAMES_START + cur_item + 1) <=
+		    && MSG_FUNCNAMES_START + cur_item + 1 <=
 		    MSG_FUNCNAMES_END)
 			cur_item++;
 		else if (ch == 3 && cur_item > 0)
@@ -180,9 +180,9 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
 		return 1;
 	} else {
 		name = NULL;
-		if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
+		if (type != KT_SPKUP && key > 0 && key <= num_key_names) {
 			synth_printf("%s\n",
-				spk_msg_get(MSG_KEYNAMES_START + key - 1));
+				     spk_msg_get(MSG_KEYNAMES_START + key - 1));
 			return 1;
 		}
 		for (i = 0; funcvals[i] != 0 && !name; i++) {
-- 
2.9.3

Re: [Outreachy kernel] [PATCH 1/2] staging: speakup: Clean up parentheses

[Julia Lawall]

This one needs to be also v3.

When you redo any patch in a series, you have to resend all of the patches
in that series, and they all have to have the same version number, even if
some of them have not changed.  Otherwise, Greg cannot figure out reliably
what should be applied and what should not.

julia

On Mon, 27 Feb 2017, Sreya Mittal wrote:

> Align next line of print statements
> to the right of open parentheses and
> remove extra parentheses.
>
> Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
> ---
>  drivers/staging/speakup/keyhelp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
> index ce94cb1..c373762 100644
> --- a/drivers/staging/speakup/keyhelp.c
> +++ b/drivers/staging/speakup/keyhelp.c
> @@ -115,9 +115,9 @@ static void say_key(int key)
>  		if (state & masks[i])
>  			synth_printf(" %s", spk_msg_get(MSG_STATES_START + i));
>  	}
> -	if ((key > 0) && (key <= num_key_names))
> +	if (key > 0 && key <= num_key_names)
>  		synth_printf(" %s\n",
> -				spk_msg_get(MSG_KEYNAMES_START + (key - 1)));
> +			     spk_msg_get(MSG_KEYNAMES_START + (key - 1)));
>  }
>
>  static int help_init(void)
> @@ -164,7 +164,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
>  		cur_item = letter_offsets[ch - 'a'];
>  	} else if (type == KT_CUR) {
>  		if (ch == 0
> -		    && (MSG_FUNCNAMES_START + cur_item + 1) <=
> +		    && MSG_FUNCNAMES_START + cur_item + 1 <=
>  		    MSG_FUNCNAMES_END)
>  			cur_item++;
>  		else if (ch == 3 && cur_item > 0)
> @@ -180,9 +180,9 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
>  		return 1;
>  	} else {
>  		name = NULL;
> -		if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
> +		if (type != KT_SPKUP && key > 0 && key <= num_key_names) {
>  			synth_printf("%s\n",
> -				spk_msg_get(MSG_KEYNAMES_START + key - 1));
> +				     spk_msg_get(MSG_KEYNAMES_START + key - 1));
>  			return 1;
>  		}
>  		for (i = 0; funcvals[i] != 0 && !name; i++) {
> --
> 2.9.3
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170227160136.22661-1-sreyamittal5%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>