[PATCH 2/2 v4] staging: speakup: Clean up if conditions

[PATCH 2/2 v4] staging: speakup: Clean up if conditions

[Sreya Mittal]

Found by checkpatch.pl
Logical conditions are on the next line, useless parentheses present
Clean up the if tests by

* Put logical conditions on the previous line
* Remove useless parentheses
* Line up the tests

Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>

---

No changes in v4

Changes in v3:
*Correct placement of patch changes

Changes in v2:
* More elaborate log message
* Fit MSG_FUNCNAMES_END) on the previous line
* Fit ch == SPEAKUP_HELP && on the previous line

 drivers/staging/speakup/keyhelp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
index c373762..4d00bc2 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -163,17 +163,15 @@ 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_END)
+		if (ch == 0 &&
+		    MSG_FUNCNAMES_START + cur_item + 1 <= MSG_FUNCNAMES_END)
 			cur_item++;
 		else if (ch == 3 && cur_item > 0)
 			cur_item--;
 		else
 			return -1;
-	} else if (type == KT_SPKUP
-			&& ch == SPEAKUP_HELP
-			&& !spk_special_handler) {
+	} else if (type == KT_SPKUP && ch == SPEAKUP_HELP &&
+		   !spk_special_handler) {
 		spk_special_handler = spk_handle_help;
 		synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
 		build_key_data(); /* rebuild each time in case new mapping */
-- 
2.9.3

Re: [PATCH 2/2 v4] staging: speakup: Clean up if conditions

[Greg Kroah-Hartman]

On Tue, Feb 28, 2017 at 12:13:59PM +0530, Sreya Mittal wrote:
> Found by checkpatch.pl
> Logical conditions are on the next line, useless parentheses present
> Clean up the if tests by
> 
> * Put logical conditions on the previous line
> * Remove useless parentheses
> * Line up the tests
> 
> Signed-off-by: Sreya Mittal <sreyamittal5@gmail.com>
> 
> ---
> 
> No changes in v4
> 
> Changes in v3:
> *Correct placement of patch changes
> 
> Changes in v2:
> * More elaborate log message
> * Fit MSG_FUNCNAMES_END) on the previous line
> * Fit ch == SPEAKUP_HELP && on the previous line
> 
>  drivers/staging/speakup/keyhelp.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
> index c373762..4d00bc2 100644
> --- a/drivers/staging/speakup/keyhelp.c
> +++ b/drivers/staging/speakup/keyhelp.c
> @@ -163,17 +163,15 @@ 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_END)
> +		if (ch == 0 &&
> +		    MSG_FUNCNAMES_START + cur_item + 1 <= MSG_FUNCNAMES_END)

Ah, now you fix up the lines.  But really, keep the extra (), they make
things much more readable and ensure that someone didn't get the
precedence order of operations incorrect.

thanks,

greg k-h