* [PATCH 0/6] multiple checkpatch issues
@ 2017-03-03 18:37 Arushi Singhal
2017-03-03 18:37 ` [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations Arushi Singhal
` (5 more replies)
0 siblings, 6 replies; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
Improve readability by fixing multiple checkpatch.pl
issues in speakup driver.
Arushi Singhal (6):
staging: speakup: Add blank line after function/struct/union/enum
declarations
staging: speakup: simple_strtoul is replaced with kstrtoul
staging: speakup: Logical continuations should be on the previous line
staging: speakup: Blank lines removed after an open brace '{'
staging: speakup: Avoid multiple assignments on same line
staging: speakup: fixes braces {} should be used on all arms of this
statement
drivers/staging/speakup/kobjects.c | 5 +-
drivers/staging/speakup/main.c | 84 ++++++++++++++++++++--------------
drivers/staging/speakup/serialio.c | 1 +
drivers/staging/speakup/speakup_dtlk.c | 1 +
drivers/staging/speakup/varhandlers.c | 2 +-
5 files changed, 55 insertions(+), 38 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:37 ` [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul Arushi Singhal
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
This patch fixes the warnings reported by checkpatch.pl
for please use a blank line after function/struct/union/enum
declarations.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/main.c | 1 +
drivers/staging/speakup/serialio.c | 1 +
drivers/staging/speakup/speakup_dtlk.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 01eabc19039c..17df20ec94be 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -108,6 +108,7 @@ enum {
CT_Window,
CT_Max
};
+
#define read_all_mode CT_Max
static struct tty_struct *tty;
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index 7e6bc3b05da3..9b2626e85042 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -21,6 +21,7 @@ static void start_serial_interrupt(int irq);
static const struct old_serial_port rs_table[] = {
SERIAL_PORT_DFNS
};
+
static const struct old_serial_port *serstate;
static int timeouts;
diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c
index 1ebe5012ec0b..e36360f65f36 100644
--- a/drivers/staging/speakup/speakup_dtlk.c
+++ b/drivers/staging/speakup/speakup_dtlk.c
@@ -43,6 +43,7 @@ static int port_forced;
static unsigned int synth_portlist[] = {
0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0
};
+
static u_char synth_status;
static struct var_t vars[] = {
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
2017-03-03 18:37 ` [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:45 ` [Outreachy kernel] " Julia Lawall
2017-03-04 13:57 ` Pranay Srivastava
2017-03-03 18:37 ` [PATCH 3/6] staging: speakup: Logical continuations should be on the previous line Arushi Singhal
` (3 subsequent siblings)
5 siblings, 2 replies; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
This patch fixes "simple_strtoul is obsolete, use kstrtoul instead"
warning.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/kobjects.c | 4 ++--
drivers/staging/speakup/main.c | 2 +-
drivers/staging/speakup/varhandlers.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index edde9e68779e..a82698c66568 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -152,7 +152,7 @@ static ssize_t chars_chartab_store(struct kobject *kobj,
continue;
}
- index = simple_strtoul(cp, &temp, 10);
+ index = kstrtoul(cp, &temp, 10);
if (index > 255) {
rejected++;
cp = linefeed + 1;
@@ -785,7 +785,7 @@ static ssize_t message_store_helper(const char *buf, size_t count,
continue;
}
- index = simple_strtoul(cp, &temp, 10);
+ index = kstrtoul(cp, &temp, 10);
while ((temp < linefeed) && (*temp == ' ' || *temp == '\t'))
temp++;
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 17df20ec94be..b43e2e156602 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -1945,7 +1945,7 @@ static int handle_goto(struct vc_data *vc, u_char type, u_char ch, u_short key)
return 1;
}
- goto_pos = simple_strtoul(goto_buf, &cp, 10);
+ goto_pos = kstrtoul(goto_buf, &cp, 10);
if (*cp == 'x') {
if (*goto_buf < '0')
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index cc984196020f..5107533bb45a 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -325,7 +325,7 @@ char *spk_s2uchar(char *start, char *dest)
{
int val;
- val = simple_strtoul(skip_spaces(start), &start, 10);
+ val = kstrtoul(skip_spaces(start), &start, 10);
if (*start == ',')
start++;
*dest = (u_char)val;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/6] staging: speakup: Logical continuations should be on the previous line
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
2017-03-03 18:37 ` [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations Arushi Singhal
2017-03-03 18:37 ` [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:37 ` [PATCH 4/6] staging: speakup: Blank lines removed after an open brace '{' Arushi Singhal
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
This patch fixes the checkpatch issue:
CHECK: Logical continuations should be on the previous line.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/main.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index b43e2e156602..4c3b5c627718 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -564,18 +564,18 @@ static u_long get_word(struct vc_data *vc)
*buf = '\0';
synth_printf("%s\n", spk_msg_get(MSG_SPACE));
return 0;
- } else if ((tmpx < vc->vc_cols - 2)
- && (ch == SPACE || ch == 0 || IS_WDLM(ch))
- && ((char)get_char(vc, (u_short *)&tmp_pos + 1, &temp) >
- SPACE)) {
+ } else if ((tmpx < vc->vc_cols - 2) &&
+ (ch == SPACE || ch == 0 || IS_WDLM(ch)) &&
+ ((char)get_char(vc, (u_short *)&tmp_pos + 1, &temp) >
+ SPACE)) {
tmp_pos += 2;
tmpx++;
} else
while (tmpx > 0) {
ch = (char)get_char(vc, (u_short *)tmp_pos - 1, &temp);
- if ((ch == SPACE || ch == 0 || IS_WDLM(ch))
- && ((char)get_char(vc, (u_short *)tmp_pos, &temp) >
- SPACE))
+ if ((ch == SPACE || ch == 0 || IS_WDLM(ch)) &&
+ ((char)get_char(vc, (u_short *)tmp_pos, &temp) >
+ SPACE))
break;
tmp_pos -= 2;
tmpx--;
@@ -586,8 +586,8 @@ static u_long get_word(struct vc_data *vc)
tmp_pos += 2;
tmpx++;
ch = (char)get_char(vc, (u_short *)tmp_pos, &temp);
- if ((ch == SPACE) || ch == 0
- || (IS_WDLM(buf[cnt - 1]) && (ch > SPACE)))
+ if ((ch == SPACE) || ch == 0 ||
+ (IS_WDLM(buf[cnt - 1]) && (ch > SPACE)))
break;
buf[cnt++] = ch;
}
@@ -725,8 +725,8 @@ static void spell_word(struct vc_data *vc)
synth_printf("%s", str_cap);
last_cap = str_cap;
}
- if (this_speakup_key == SPELL_PHONETIC
- && (isascii(ch) && isalpha(ch))) {
+ if (this_speakup_key == SPELL_PHONETIC &&
+ (isascii(ch) && isalpha(ch))) {
ch &= 31;
cp1 = phonetic[--ch];
} else {
@@ -895,8 +895,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
while (start < end) {
sentbuf[bn][i] = (char)get_char(vc, (u_short *)start, &tmp);
if (i > 0) {
- if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.'
- && numsentences[bn] < 9) {
+ if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.' &&
+ numsentences[bn] < 9) {
/* Sentence Marker */
numsentences[bn]++;
sentmarks[bn][numsentences[bn]] =
@@ -1280,8 +1280,8 @@ void spk_reset_default_chars(void)
/* First, free any non-default */
for (i = 0; i < 256; i++) {
- if (spk_characters[i]
- && (spk_characters[i] != spk_default_chars[i]))
+ if (spk_characters[i] &&
+ (spk_characters[i] != spk_default_chars[i]))
kfree(spk_characters[i]);
}
@@ -2073,8 +2073,8 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
tty = vc->port.tty;
if (type >= 0xf0)
type -= 0xf0;
- if (type == KT_PAD
- && (vt_get_leds(fg_console, VC_NUMLOCK))) {
+ if (type == KT_PAD &&
+ (vt_get_leds(fg_console, VC_NUMLOCK))) {
if (up_flag) {
spk_keydown = 0;
goto out;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/6] staging: speakup: Blank lines removed after an open brace '{'
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
` (2 preceding siblings ...)
2017-03-03 18:37 ` [PATCH 3/6] staging: speakup: Logical continuations should be on the previous line Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:37 ` [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line Arushi Singhal
2017-03-03 18:37 ` [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement Arushi Singhal
5 siblings, 0 replies; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
Blank lines aren't necessary after an open brace '{' as reported by
Checkpatch.pl.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/kobjects.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index a82698c66568..16c4d3d1e873 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -761,7 +761,6 @@ static ssize_t message_store_helper(const char *buf, size_t count,
enum msg_index_t curmessage;
while (cp < end) {
-
while ((cp < end) && (*cp == ' ' || *cp == '\t'))
cp++;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
` (3 preceding siblings ...)
2017-03-03 18:37 ` [PATCH 4/6] staging: speakup: Blank lines removed after an open brace '{' Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:42 ` [Outreachy kernel] " Julia Lawall
2017-03-03 18:37 ` [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement Arushi Singhal
5 siblings, 1 reply; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
This patch fixes the checkpatch.pl warning "multiple assignments
should be avoided."
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/main.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 4c3b5c627718..7915e75664f4 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -269,9 +269,12 @@ static unsigned char get_attributes(struct vc_data *vc, u16 *pos)
static void speakup_date(struct vc_data *vc)
{
- spk_x = spk_cx = vc->vc_x;
- spk_y = spk_cy = vc->vc_y;
- spk_pos = spk_cp = vc->vc_pos;
+ spk_x = vc->vc_x;
+ spk_cx = vc->vc_x;
+ spk_y = vc->vc_y;
+ spk_cy = vc->vc_y;
+ spk_pos = vc->vc_pos;
+ spk_cp = vc->vc_pos;
spk_old_attr = spk_attr;
spk_attr = get_attributes(vc, (u_short *)spk_pos);
}
@@ -1643,9 +1646,12 @@ static int speak_highlight(struct vc_data *vc)
spk_do_flush();
spkup_write(speakup_console[vc_num]->ht.highbuf[hc],
speakup_console[vc_num]->ht.highsize[hc]);
- spk_pos = spk_cp = speakup_console[vc_num]->ht.rpos[hc];
- spk_x = spk_cx = speakup_console[vc_num]->ht.rx[hc];
- spk_y = spk_cy = speakup_console[vc_num]->ht.ry[hc];
+ spk_pos = speakup_console[vc_num]->ht.rpos[hc];
+ spk_cp = speakup_console[vc_num]->ht.rpos[hc];
+ spk_x = speakup_console[vc_num]->ht.rx[hc];
+ spk_cx = speakup_console[vc_num]->ht.rx[hc];
+ spk_y = speakup_console[vc_num]->ht.ry[hc];
+ spk_cy = speakup_console[vc_num]->ht.ry[hc];
return 1;
}
return 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
` (4 preceding siblings ...)
2017-03-03 18:37 ` [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line Arushi Singhal
@ 2017-03-03 18:37 ` Arushi Singhal
2017-03-03 18:40 ` [Outreachy kernel] " Julia Lawall
5 siblings, 1 reply; 12+ messages in thread
From: Arushi Singhal @ 2017-03-03 18:37 UTC (permalink / raw)
To: w.d.hubbs
Cc: chris, outreachy-kernel, kirk, samuel.thibault, gregkh, speakup,
devel, linux-kernel, Arushi Singhal
This patch fixes the checks reported by checkpatch.pl
for braces {} should be used on all arms of this statement.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/speakup/main.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 7915e75664f4..6179e0aafa25 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
break;
spk_y--;
spk_x = vc->vc_cols - 1;
- } else
+ } else{
spk_x--;
+ }
spk_pos -= 2;
ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
if (ch == SPACE || ch == 0)
@@ -694,8 +695,9 @@ static void say_next_word(struct vc_data *vc)
spk_y++;
spk_x = 0;
edge_said = edge_right;
- } else
+ } else {
spk_x++;
+ }
spk_pos += 2;
last_state = state;
}
@@ -722,8 +724,9 @@ static void spell_word(struct vc_data *vc)
spk_pitch_shift++;
else /* synth has no pitch */
last_cap = spk_str_caps_stop;
- } else
+ } else {
str_cap = spk_str_caps_stop;
+ }
if (str_cap != last_cap) {
synth_printf("%s", str_cap);
last_cap = str_cap;
@@ -1331,8 +1334,9 @@ static int speakup_allocate(struct vc_data *vc)
if (!speakup_console[vc_num])
return -ENOMEM;
speakup_date(vc);
- } else if (!spk_parked)
+ } else if (!spk_parked) {
speakup_date(vc);
+ }
return 0;
}
@@ -1385,8 +1389,9 @@ static void read_all_doc(struct vc_data *vc)
prev_cursor_track = cursor_track;
cursor_track = read_all_mode;
spk_reset_index_count(0);
- if (get_sentence_buf(vc, 0) == -1)
+ if (get_sentence_buf(vc, 0) == -1) {
kbd_fakekey2(vc, RA_DOWN_ARROW);
+ }
else {
say_sentence_num(0, 0);
synth_insert_next_index(0);
@@ -1434,8 +1439,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
if (!say_sentence_num(sentcount + 1, 1)) {
sn = 1;
spk_reset_index_count(sn);
- } else
+ } else {
synth_insert_next_index(0);
+ }
if (!say_sentence_num(sn, 0)) {
kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
return;
@@ -1464,8 +1470,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
rv = get_sentence_buf(vc, 0);
if (rv == -1)
read_all_doc(vc);
- if (rv == 0)
+ if (rv == 0) {
kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
+ }
else {
say_sentence_num(1, 0);
synth_insert_next_index(0);
@@ -2162,10 +2169,11 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
if (type == KT_SPEC && value == 1) {
value = '\n';
type = KT_LATIN;
- } else if (type == KT_LETTER)
+ } else if (type == KT_LETTER) {
type = KT_LATIN;
- else if (value == 0x7f)
+ } else if (value == 0x7f) {
value = 8; /* make del = backspace */
+ }
ret = (*spk_special_handler) (vc, type, value, keycode);
spk_close_press = 0;
if (ret < 0)
@@ -2259,8 +2267,9 @@ static int vt_notifier_call(struct notifier_block *nb,
speakup_deallocate(vc);
break;
case VT_WRITE:
- if (param->c == '\b')
+ if (param->c == '\b') {
speakup_bs(vc);
+ }
else if (param->c < 0x100) {
char d = param->c;
--
2.11.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement
2017-03-03 18:37 ` [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement Arushi Singhal
@ 2017-03-03 18:40 ` Julia Lawall
2017-03-03 20:16 ` Joe Perches
0 siblings, 1 reply; 12+ messages in thread
From: Julia Lawall @ 2017-03-03 18:40 UTC (permalink / raw)
To: Arushi Singhal
Cc: w.d.hubbs, chris, outreachy-kernel, kirk, samuel.thibault,
gregkh, speakup, devel, linux-kernel
On Sat, 4 Mar 2017, Arushi Singhal wrote:
> This patch fixes the checks reported by checkpatch.pl
> for braces {} should be used on all arms of this statement.
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> drivers/staging/speakup/main.c | 29 +++++++++++++++++++----------
> 1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index 7915e75664f4..6179e0aafa25 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
> break;
> spk_y--;
> spk_x = vc->vc_cols - 1;
> - } else
> + } else{
else needs a space after it.
julia
> spk_x--;
> + }
> spk_pos -= 2;
> ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
> if (ch == SPACE || ch == 0)
> @@ -694,8 +695,9 @@ static void say_next_word(struct vc_data *vc)
> spk_y++;
> spk_x = 0;
> edge_said = edge_right;
> - } else
> + } else {
> spk_x++;
> + }
> spk_pos += 2;
> last_state = state;
> }
> @@ -722,8 +724,9 @@ static void spell_word(struct vc_data *vc)
> spk_pitch_shift++;
> else /* synth has no pitch */
> last_cap = spk_str_caps_stop;
> - } else
> + } else {
> str_cap = spk_str_caps_stop;
> + }
> if (str_cap != last_cap) {
> synth_printf("%s", str_cap);
> last_cap = str_cap;
> @@ -1331,8 +1334,9 @@ static int speakup_allocate(struct vc_data *vc)
> if (!speakup_console[vc_num])
> return -ENOMEM;
> speakup_date(vc);
> - } else if (!spk_parked)
> + } else if (!spk_parked) {
> speakup_date(vc);
> + }
>
> return 0;
> }
> @@ -1385,8 +1389,9 @@ static void read_all_doc(struct vc_data *vc)
> prev_cursor_track = cursor_track;
> cursor_track = read_all_mode;
> spk_reset_index_count(0);
> - if (get_sentence_buf(vc, 0) == -1)
> + if (get_sentence_buf(vc, 0) == -1) {
> kbd_fakekey2(vc, RA_DOWN_ARROW);
> + }
> else {
> say_sentence_num(0, 0);
> synth_insert_next_index(0);
> @@ -1434,8 +1439,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
> if (!say_sentence_num(sentcount + 1, 1)) {
> sn = 1;
> spk_reset_index_count(sn);
> - } else
> + } else {
> synth_insert_next_index(0);
> + }
> if (!say_sentence_num(sn, 0)) {
> kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
> return;
> @@ -1464,8 +1470,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
> rv = get_sentence_buf(vc, 0);
> if (rv == -1)
> read_all_doc(vc);
> - if (rv == 0)
> + if (rv == 0) {
> kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
> + }
> else {
> say_sentence_num(1, 0);
> synth_insert_next_index(0);
> @@ -2162,10 +2169,11 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
> if (type == KT_SPEC && value == 1) {
> value = '\n';
> type = KT_LATIN;
> - } else if (type == KT_LETTER)
> + } else if (type == KT_LETTER) {
> type = KT_LATIN;
> - else if (value == 0x7f)
> + } else if (value == 0x7f) {
> value = 8; /* make del = backspace */
> + }
> ret = (*spk_special_handler) (vc, type, value, keycode);
> spk_close_press = 0;
> if (ret < 0)
> @@ -2259,8 +2267,9 @@ static int vt_notifier_call(struct notifier_block *nb,
> speakup_deallocate(vc);
> break;
> case VT_WRITE:
> - if (param->c == '\b')
> + if (param->c == '\b') {
> speakup_bs(vc);
> + }
> else if (param->c < 0x100) {
> char d = param->c;
>
> --
> 2.11.0
>
> --
> 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/20170303183707.14830-7-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Outreachy kernel] [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line
2017-03-03 18:37 ` [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line Arushi Singhal
@ 2017-03-03 18:42 ` Julia Lawall
0 siblings, 0 replies; 12+ messages in thread
From: Julia Lawall @ 2017-03-03 18:42 UTC (permalink / raw)
To: Arushi Singhal
Cc: w.d.hubbs, chris, outreachy-kernel, kirk, samuel.thibault,
gregkh, speakup, devel, linux-kernel
On Sat, 4 Mar 2017, Arushi Singhal wrote:
> This patch fixes the checkpatch.pl warning "multiple assignments
> should be avoided."
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> drivers/staging/speakup/main.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index 4c3b5c627718..7915e75664f4 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -269,9 +269,12 @@ static unsigned char get_attributes(struct vc_data *vc, u16 *pos)
>
> static void speakup_date(struct vc_data *vc)
> {
> - spk_x = spk_cx = vc->vc_x;
> - spk_y = spk_cy = vc->vc_y;
> - spk_pos = spk_cp = vc->vc_pos;
> + spk_x = vc->vc_x;
> + spk_cx = vc->vc_x;
> + spk_y = vc->vc_y;
> + spk_cy = vc->vc_y;
> + spk_pos = vc->vc_pos;
> + spk_cp = vc->vc_pos;
> spk_old_attr = spk_attr;
> spk_attr = get_attributes(vc, (u_short *)spk_pos);
> }
> @@ -1643,9 +1646,12 @@ static int speak_highlight(struct vc_data *vc)
> spk_do_flush();
> spkup_write(speakup_console[vc_num]->ht.highbuf[hc],
> speakup_console[vc_num]->ht.highsize[hc]);
> - spk_pos = spk_cp = speakup_console[vc_num]->ht.rpos[hc];
> - spk_x = spk_cx = speakup_console[vc_num]->ht.rx[hc];
> - spk_y = spk_cy = speakup_console[vc_num]->ht.ry[hc];
> + spk_pos = speakup_console[vc_num]->ht.rpos[hc];
> + spk_cp = speakup_console[vc_num]->ht.rpos[hc];
> + spk_x = speakup_console[vc_num]->ht.rx[hc];
> + spk_cx = speakup_console[vc_num]->ht.rx[hc];
> + spk_y = speakup_console[vc_num]->ht.ry[hc];
> + spk_cy = speakup_console[vc_num]->ht.ry[hc];
It could be better to put eg spk_cp = spk_pos;. Repeating th big
expression on the right hand side could be error prone in the long term.
julia
> return 1;
> }
> return 0;
> --
> 2.11.0
>
> --
> 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/20170303183707.14830-6-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Outreachy kernel] [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul
2017-03-03 18:37 ` [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul Arushi Singhal
@ 2017-03-03 18:45 ` Julia Lawall
2017-03-04 13:57 ` Pranay Srivastava
1 sibling, 0 replies; 12+ messages in thread
From: Julia Lawall @ 2017-03-03 18:45 UTC (permalink / raw)
To: Arushi Singhal
Cc: w.d.hubbs, chris, outreachy-kernel, kirk, samuel.thibault,
gregkh, speakup, devel, linux-kernel
On Sat, 4 Mar 2017, Arushi Singhal wrote:
> This patch fixes "simple_strtoul is obsolete, use kstrtoul instead"
> warning.
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> drivers/staging/speakup/kobjects.c | 4 ++--
> drivers/staging/speakup/main.c | 2 +-
> drivers/staging/speakup/varhandlers.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
> index edde9e68779e..a82698c66568 100644
> --- a/drivers/staging/speakup/kobjects.c
> +++ b/drivers/staging/speakup/kobjects.c
> @@ -152,7 +152,7 @@ static ssize_t chars_chartab_store(struct kobject *kobj,
> continue;
> }
>
> - index = simple_strtoul(cp, &temp, 10);
> + index = kstrtoul(cp, &temp, 10);
It seems unlikely that you actually compiled this code. The argument list
for kstrtoul has a completely different set of types.
julia
> if (index > 255) {
> rejected++;
> cp = linefeed + 1;
> @@ -785,7 +785,7 @@ static ssize_t message_store_helper(const char *buf, size_t count,
> continue;
> }
>
> - index = simple_strtoul(cp, &temp, 10);
> + index = kstrtoul(cp, &temp, 10);
>
> while ((temp < linefeed) && (*temp == ' ' || *temp == '\t'))
> temp++;
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index 17df20ec94be..b43e2e156602 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -1945,7 +1945,7 @@ static int handle_goto(struct vc_data *vc, u_char type, u_char ch, u_short key)
> return 1;
> }
>
> - goto_pos = simple_strtoul(goto_buf, &cp, 10);
> + goto_pos = kstrtoul(goto_buf, &cp, 10);
>
> if (*cp == 'x') {
> if (*goto_buf < '0')
> diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
> index cc984196020f..5107533bb45a 100644
> --- a/drivers/staging/speakup/varhandlers.c
> +++ b/drivers/staging/speakup/varhandlers.c
> @@ -325,7 +325,7 @@ char *spk_s2uchar(char *start, char *dest)
> {
> int val;
>
> - val = simple_strtoul(skip_spaces(start), &start, 10);
> + val = kstrtoul(skip_spaces(start), &start, 10);
> if (*start == ',')
> start++;
> *dest = (u_char)val;
> --
> 2.11.0
>
> --
> 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/20170303183707.14830-3-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement
2017-03-03 18:40 ` [Outreachy kernel] " Julia Lawall
@ 2017-03-03 20:16 ` Joe Perches
0 siblings, 0 replies; 12+ messages in thread
From: Joe Perches @ 2017-03-03 20:16 UTC (permalink / raw)
To: Julia Lawall, Arushi Singhal
Cc: w.d.hubbs, chris, outreachy-kernel, kirk, samuel.thibault,
gregkh, speakup, devel, linux-kernel
On Fri, 2017-03-03 at 19:40 +0100, Julia Lawall wrote:
> On Sat, 4 Mar 2017, Arushi Singhal wrote:
> > This patch fixes the checks reported by checkpatch.pl
> > for braces {} should be used on all arms of this statement.
> >
> > Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> > ---
> > drivers/staging/speakup/main.c | 29 +++++++++++++++++++----------
> > 1 file changed, 19 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> > index 7915e75664f4..6179e0aafa25 100644
> > --- a/drivers/staging/speakup/main.c
> > +++ b/drivers/staging/speakup/main.c
> > @@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
> > break;
> > spk_y--;
> > spk_x = vc->vc_cols - 1;
> > - } else
> > + } else{
>
> else needs a space after it.
And if you had scanned this suggested patch with
checkpatch, you would have known that.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul
2017-03-03 18:37 ` [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul Arushi Singhal
2017-03-03 18:45 ` [Outreachy kernel] " Julia Lawall
@ 2017-03-04 13:57 ` Pranay Srivastava
1 sibling, 0 replies; 12+ messages in thread
From: Pranay Srivastava @ 2017-03-04 13:57 UTC (permalink / raw)
To: Arushi Singhal
Cc: w.d.hubbs, devel, kirk, gregkh, speakup, linux-kernel,
outreachy-kernel, samuel.thibault, chris
[-- Attachment #1: Type: text/plain, Size: 2770 bytes --]
Hey Arushi,
On Saturday, March 4, 2017, Arushi Singhal <arushisinghal19971997@gmail.com>
wrote:
> This patch fixes "simple_strtoul is obsolete, use kstrtoul instead"
> warning.
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> drivers/staging/speakup/kobjects.c | 4 ++--
> drivers/staging/speakup/main.c | 2 +-
I guess a similar patch was NAKed earlier this week. Can you check if
you are doing this differently.
> drivers/staging/speakup/varhandlers.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/speakup/kobjects.c
b/drivers/staging/speakup/kobjects.c
> index edde9e68779e..a82698c66568 100644
> --- a/drivers/staging/speakup/kobjects.c
> +++ b/drivers/staging/speakup/kobjects.c
> @@ -152,7 +152,7 @@ static ssize_t chars_chartab_store(struct kobject
*kobj,
> continue;
> }
>
> - index = simple_strtoul(cp, &temp, 10);
> + index = kstrtoul(cp, &temp, 10);
> if (index > 255) {
> rejected++;
> cp = linefeed + 1;
> @@ -785,7 +785,7 @@ static ssize_t message_store_helper(const char *buf,
size_t count,
> continue;
> }
>
> - index = simple_strtoul(cp, &temp, 10);
> + index = kstrtoul(cp, &temp, 10);
>
> while ((temp < linefeed) && (*temp == ' ' || *temp ==
'\t'))
> temp++;
> diff --git a/drivers/staging/speakup/main.c
b/drivers/staging/speakup/main.c
> index 17df20ec94be..b43e2e156602 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -1945,7 +1945,7 @@ static int handle_goto(struct vc_data *vc, u_char
type, u_char ch, u_short key)
> return 1;
> }
>
> - goto_pos = simple_strtoul(goto_buf, &cp, 10);
> + goto_pos = kstrtoul(goto_buf, &cp, 10);
>
> if (*cp == 'x') {
> if (*goto_buf < '0')
> diff --git a/drivers/staging/speakup/varhandlers.c
b/drivers/staging/speakup/varhandlers.c
> index cc984196020f..5107533bb45a 100644
> --- a/drivers/staging/speakup/varhandlers.c
> +++ b/drivers/staging/speakup/varhandlers.c
> @@ -325,7 +325,7 @@ char *spk_s2uchar(char *start, char *dest)
> {
> int val;
>
> - val = simple_strtoul(skip_spaces(start), &start, 10);
> + val = kstrtoul(skip_spaces(start), &start, 10);
> if (*start == ',')
> start++;
> *dest = (u_char)val;
> --
> 2.11.0
>
> _______________________________________________
> devel mailing list
> devel@linuxdriverproject.org
> http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
>
--
---P.K.S
[-- Attachment #2: Type: text/html, Size: 3755 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-03-05 6:15 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-03 18:37 [PATCH 0/6] multiple checkpatch issues Arushi Singhal
2017-03-03 18:37 ` [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations Arushi Singhal
2017-03-03 18:37 ` [PATCH 2/6] staging: speakup: simple_strtoul is replaced with kstrtoul Arushi Singhal
2017-03-03 18:45 ` [Outreachy kernel] " Julia Lawall
2017-03-04 13:57 ` Pranay Srivastava
2017-03-03 18:37 ` [PATCH 3/6] staging: speakup: Logical continuations should be on the previous line Arushi Singhal
2017-03-03 18:37 ` [PATCH 4/6] staging: speakup: Blank lines removed after an open brace '{' Arushi Singhal
2017-03-03 18:37 ` [PATCH 5/6] staging: speakup: Avoid multiple assignments on same line Arushi Singhal
2017-03-03 18:42 ` [Outreachy kernel] " Julia Lawall
2017-03-03 18:37 ` [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement Arushi Singhal
2017-03-03 18:40 ` [Outreachy kernel] " Julia Lawall
2017-03-03 20:16 ` Joe Perches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.