From: Arushi Singhal <arushisinghal19971997@gmail.com>
To: w.d.hubbs@gmail.com
Cc: chris@the-brannons.com, outreachy-kernel@googlegroups.com,
kirk@reisers.ca, samuel.thibault@ens-lyon.org,
gregkh@linuxfoundation.org, speakup@linux-speakup.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Arushi Singhal <arushisinghal19971997@gmail.com>
Subject: [PATCH 3/6] staging: speakup: Logical continuations should be on the previous line
Date: Sat, 4 Mar 2017 00:07:04 +0530 [thread overview]
Message-ID: <20170303183707.14830-4-arushisinghal19971997@gmail.com> (raw)
In-Reply-To: <20170303183707.14830-1-arushisinghal19971997@gmail.com>
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
next prev parent reply other threads:[~2017-03-03 18:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Arushi Singhal [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170303183707.14830-4-arushisinghal19971997@gmail.com \
--to=arushisinghal19971997@gmail.com \
--cc=chris@the-brannons.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kirk@reisers.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=outreachy-kernel@googlegroups.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=speakup@linux-speakup.org \
--cc=w.d.hubbs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.