subject:"\[PATCH\] staging\: speakup\: \(coding style\) Add spaces around operands \(checkpatch checks\)"

Re: [PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

2015-11-19 Thread Luis de Bethencourt

Hi al,

Looks good and silences the checkpatch warnings.

Christian,
There are more checkpatch warnings in this file. Could you fix them as well?


Reviewed-by: Luis de Bethencourt 


On Thu, Nov 19, 2015 at 02:40:59PM +0100, Christian Colic wrote:
> Fix checkpatch check: CHECK: spaces preferred around that '-' (ctx:VxV)
> Add spaces around operands to fix these warnings.
> 
> Signed-off-by: Christian Colic 
> ---
>  drivers/staging/speakup/keyhelp.c | 18 +-
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/speakup/keyhelp.c 
> b/drivers/staging/speakup/keyhelp.c
> index 02d5c70..d14089a 100644
> --- a/drivers/staging/speakup/keyhelp.c
> +++ b/drivers/staging/speakup/keyhelp.c
> @@ -74,7 +74,7 @@ static void build_key_data(void)
>   for (i = 0; i < nstates; i++, kp++) {
>   if (!*kp)
>   continue;
> - if ((state_tbl[i]&16) != 0 && *kp == SPK_KEY)
> + if ((state_tbl[i] & 16) != 0 && *kp == SPK_KEY)
>   continue;
>   counters[*kp]++;
>   }
> @@ -83,7 +83,7 @@ static void build_key_data(void)
>   if (counters[i] == 0)
>   continue;
>   key_offsets[i] = offset;
> - offset += (counters[i]+1);
> + offset += (counters[i] + 1);
>   if (offset >= MAXKEYS)
>   break;
>   }
> @@ -97,7 +97,7 @@ static void build_key_data(void)
>   ch1 = *kp++;
>   if (!ch1)
>   continue;
> - if ((state_tbl[i]&16) != 0 && ch1 == SPK_KEY)
> + if ((state_tbl[i] & 16) != 0 && ch1 == SPK_KEY)
>   continue;
>   key = (state_tbl[i] << 8) + ch;
>   counters[ch1]--;
> @@ -130,14 +130,14 @@ static int help_init(void)
>   int i;
>   int num_funcs = MSG_FUNCNAMES_END - MSG_FUNCNAMES_START + 1;
>  
> - state_tbl = spk_our_keys[0]+SHIFT_TBL_SIZE+2;
> + state_tbl = spk_our_keys[0] + SHIFT_TBL_SIZE + 2;
>   for (i = 0; i < num_funcs; i++) {
>   char *cur_funcname = spk_msg_get(MSG_FUNCNAMES_START + i);
>  
>   if (start == *cur_funcname)
>   continue;
>   start = *cur_funcname;
> - letter_offsets[(start&31)-1] = i;
> + letter_offsets[(start & 31) - 1] = i;
>   }
>   return 0;
>  }
> @@ -160,12 +160,12 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   ch |= 32; /* lower case */
>   if (ch < 'a' || ch > 'z')
>   return -1;
> - if (letter_offsets[ch-'a'] == -1) {
> + if (letter_offsets[ch - 'a'] == -1) {
>   synth_printf(spk_msg_get(MSG_NO_COMMAND), ch);
>   synth_printf("\n");
>   return 1;
>   }
> - cur_item = letter_offsets[ch-'a'];
> + cur_item = letter_offsets[ch - 'a'];
>   } else if (type == KT_CUR) {
>   if (ch == 0
>   && (MSG_FUNCNAMES_START + cur_item + 1) <=
> @@ -186,7 +186,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   name = NULL;
>   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++) {
> @@ -195,7 +195,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   }
>   if (!name)
>   return -1;
> - kp = spk_our_keys[key]+1;
> + kp = spk_our_keys[key] + 1;
>   for (i = 0; i < nstates; i++) {
>   if (ch == kp[i])
>   break;
> -- 
> 2.5.0
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

2015-11-19 Thread Christian Colic

Fix checkpatch check: CHECK: spaces preferred around that '-' (ctx:VxV)
Add spaces around operands to fix these warnings.

Signed-off-by: Christian Colic 
---
 drivers/staging/speakup/keyhelp.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c 
b/drivers/staging/speakup/keyhelp.c
index 02d5c70..d14089a 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -74,7 +74,7 @@ static void build_key_data(void)
for (i = 0; i < nstates; i++, kp++) {
if (!*kp)
continue;
-   if ((state_tbl[i]&16) != 0 && *kp == SPK_KEY)
+   if ((state_tbl[i] & 16) != 0 && *kp == SPK_KEY)
continue;
counters[*kp]++;
}
@@ -83,7 +83,7 @@ static void build_key_data(void)
if (counters[i] == 0)
continue;
key_offsets[i] = offset;
-   offset += (counters[i]+1);
+   offset += (counters[i] + 1);
if (offset >= MAXKEYS)
break;
}
@@ -97,7 +97,7 @@ static void build_key_data(void)
ch1 = *kp++;
if (!ch1)
continue;
-   if ((state_tbl[i]&16) != 0 && ch1 == SPK_KEY)
+   if ((state_tbl[i] & 16) != 0 && ch1 == SPK_KEY)
continue;
key = (state_tbl[i] << 8) + ch;
counters[ch1]--;
@@ -130,14 +130,14 @@ static int help_init(void)
int i;
int num_funcs = MSG_FUNCNAMES_END - MSG_FUNCNAMES_START + 1;
 
-   state_tbl = spk_our_keys[0]+SHIFT_TBL_SIZE+2;
+   state_tbl = spk_our_keys[0] + SHIFT_TBL_SIZE + 2;
for (i = 0; i < num_funcs; i++) {
char *cur_funcname = spk_msg_get(MSG_FUNCNAMES_START + i);
 
if (start == *cur_funcname)
continue;
start = *cur_funcname;
-   letter_offsets[(start&31)-1] = i;
+   letter_offsets[(start & 31) - 1] = i;
}
return 0;
 }
@@ -160,12 +160,12 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
u_char ch, u_short key)
ch |= 32; /* lower case */
if (ch < 'a' || ch > 'z')
return -1;
-   if (letter_offsets[ch-'a'] == -1) {
+   if (letter_offsets[ch - 'a'] == -1) {
synth_printf(spk_msg_get(MSG_NO_COMMAND), ch);
synth_printf("\n");
return 1;
}
-   cur_item = letter_offsets[ch-'a'];
+   cur_item = letter_offsets[ch - 'a'];
} else if (type == KT_CUR) {
if (ch == 0
&& (MSG_FUNCNAMES_START + cur_item + 1) <=
@@ -186,7 +186,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char 
ch, u_short key)
name = NULL;
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++) {
@@ -195,7 +195,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char 
ch, u_short key)
}
if (!name)
return -1;
-   kp = spk_our_keys[key]+1;
+   kp = spk_our_keys[key] + 1;
for (i = 0; i < nstates; i++) {
if (ch == kp[i])
break;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

2015-11-19 Thread Christian Colic

Fix checkpatch check: CHECK: spaces preferred around that '-' (ctx:VxV)
Add spaces around operands to fix these warnings.

Signed-off-by: Christian Colic 
---
 drivers/staging/speakup/keyhelp.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c 
b/drivers/staging/speakup/keyhelp.c
index 02d5c70..d14089a 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -74,7 +74,7 @@ static void build_key_data(void)
for (i = 0; i < nstates; i++, kp++) {
if (!*kp)
continue;
-   if ((state_tbl[i]&16) != 0 && *kp == SPK_KEY)
+   if ((state_tbl[i] & 16) != 0 && *kp == SPK_KEY)
continue;
counters[*kp]++;
}
@@ -83,7 +83,7 @@ static void build_key_data(void)
if (counters[i] == 0)
continue;
key_offsets[i] = offset;
-   offset += (counters[i]+1);
+   offset += (counters[i] + 1);
if (offset >= MAXKEYS)
break;
}
@@ -97,7 +97,7 @@ static void build_key_data(void)
ch1 = *kp++;
if (!ch1)
continue;
-   if ((state_tbl[i]&16) != 0 && ch1 == SPK_KEY)
+   if ((state_tbl[i] & 16) != 0 && ch1 == SPK_KEY)
continue;
key = (state_tbl[i] << 8) + ch;
counters[ch1]--;
@@ -130,14 +130,14 @@ static int help_init(void)
int i;
int num_funcs = MSG_FUNCNAMES_END - MSG_FUNCNAMES_START + 1;
 
-   state_tbl = spk_our_keys[0]+SHIFT_TBL_SIZE+2;
+   state_tbl = spk_our_keys[0] + SHIFT_TBL_SIZE + 2;
for (i = 0; i < num_funcs; i++) {
char *cur_funcname = spk_msg_get(MSG_FUNCNAMES_START + i);
 
if (start == *cur_funcname)
continue;
start = *cur_funcname;
-   letter_offsets[(start&31)-1] = i;
+   letter_offsets[(start & 31) - 1] = i;
}
return 0;
 }
@@ -160,12 +160,12 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
u_char ch, u_short key)
ch |= 32; /* lower case */
if (ch < 'a' || ch > 'z')
return -1;
-   if (letter_offsets[ch-'a'] == -1) {
+   if (letter_offsets[ch - 'a'] == -1) {
synth_printf(spk_msg_get(MSG_NO_COMMAND), ch);
synth_printf("\n");
return 1;
}
-   cur_item = letter_offsets[ch-'a'];
+   cur_item = letter_offsets[ch - 'a'];
} else if (type == KT_CUR) {
if (ch == 0
&& (MSG_FUNCNAMES_START + cur_item + 1) <=
@@ -186,7 +186,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char 
ch, u_short key)
name = NULL;
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++) {
@@ -195,7 +195,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char 
ch, u_short key)
}
if (!name)
return -1;
-   kp = spk_our_keys[key]+1;
+   kp = spk_our_keys[key] + 1;
for (i = 0; i < nstates; i++) {
if (ch == kp[i])
break;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

2015-11-19 Thread Luis de Bethencourt

Hi al,

Looks good and silences the checkpatch warnings.

Christian,
There are more checkpatch warnings in this file. Could you fix them as well?


Reviewed-by: Luis de Bethencourt 


On Thu, Nov 19, 2015 at 02:40:59PM +0100, Christian Colic wrote:
> Fix checkpatch check: CHECK: spaces preferred around that '-' (ctx:VxV)
> Add spaces around operands to fix these warnings.
> 
> Signed-off-by: Christian Colic 
> ---
>  drivers/staging/speakup/keyhelp.c | 18 +-
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/speakup/keyhelp.c 
> b/drivers/staging/speakup/keyhelp.c
> index 02d5c70..d14089a 100644
> --- a/drivers/staging/speakup/keyhelp.c
> +++ b/drivers/staging/speakup/keyhelp.c
> @@ -74,7 +74,7 @@ static void build_key_data(void)
>   for (i = 0; i < nstates; i++, kp++) {
>   if (!*kp)
>   continue;
> - if ((state_tbl[i]&16) != 0 && *kp == SPK_KEY)
> + if ((state_tbl[i] & 16) != 0 && *kp == SPK_KEY)
>   continue;
>   counters[*kp]++;
>   }
> @@ -83,7 +83,7 @@ static void build_key_data(void)
>   if (counters[i] == 0)
>   continue;
>   key_offsets[i] = offset;
> - offset += (counters[i]+1);
> + offset += (counters[i] + 1);
>   if (offset >= MAXKEYS)
>   break;
>   }
> @@ -97,7 +97,7 @@ static void build_key_data(void)
>   ch1 = *kp++;
>   if (!ch1)
>   continue;
> - if ((state_tbl[i]&16) != 0 && ch1 == SPK_KEY)
> + if ((state_tbl[i] & 16) != 0 && ch1 == SPK_KEY)
>   continue;
>   key = (state_tbl[i] << 8) + ch;
>   counters[ch1]--;
> @@ -130,14 +130,14 @@ static int help_init(void)
>   int i;
>   int num_funcs = MSG_FUNCNAMES_END - MSG_FUNCNAMES_START + 1;
>  
> - state_tbl = spk_our_keys[0]+SHIFT_TBL_SIZE+2;
> + state_tbl = spk_our_keys[0] + SHIFT_TBL_SIZE + 2;
>   for (i = 0; i < num_funcs; i++) {
>   char *cur_funcname = spk_msg_get(MSG_FUNCNAMES_START + i);
>  
>   if (start == *cur_funcname)
>   continue;
>   start = *cur_funcname;
> - letter_offsets[(start&31)-1] = i;
> + letter_offsets[(start & 31) - 1] = i;
>   }
>   return 0;
>  }
> @@ -160,12 +160,12 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   ch |= 32; /* lower case */
>   if (ch < 'a' || ch > 'z')
>   return -1;
> - if (letter_offsets[ch-'a'] == -1) {
> + if (letter_offsets[ch - 'a'] == -1) {
>   synth_printf(spk_msg_get(MSG_NO_COMMAND), ch);
>   synth_printf("\n");
>   return 1;
>   }
> - cur_item = letter_offsets[ch-'a'];
> + cur_item = letter_offsets[ch - 'a'];
>   } else if (type == KT_CUR) {
>   if (ch == 0
>   && (MSG_FUNCNAMES_START + cur_item + 1) <=
> @@ -186,7 +186,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   name = NULL;
>   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++) {
> @@ -195,7 +195,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, 
> u_char ch, u_short key)
>   }
>   if (!name)
>   return -1;
> - kp = spk_our_keys[key]+1;
> + kp = spk_our_keys[key] + 1;
>   for (i = 0; i < nstates; i++) {
>   if (ch == kp[i])
>   break;
> -- 
> 2.5.0
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

[PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

[PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

Re: [PATCH] staging: speakup: (coding style) Add spaces around operands (checkpatch checks)

4 matches

Site Navigation

Mail list logo

Footer information