]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: speakup: Moved logical to previous line.
authorArushi Singhal <arushisinghal19971997@gmail.com>
Tue, 21 Mar 2017 11:42:25 +0000 (17:12 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Mar 2017 13:20:40 +0000 (14:20 +0100)
Moved logical operator to previous line to fix the following
checkpatch issue:

CHECK: Logical continuations should be on the previous line.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/main.c

index d890b9a864de8ac6b06a500d1bbd5d84345062c8..1ebe5cbdbb5a35043bc63101de35e395ce8d9478 100644 (file)
@@ -902,8 +902,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
        while (start < end) {
                sentbuf[bn][i] = 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]] =
@@ -1300,8 +1300,8 @@ void spk_reset_default_chars(void)
 
        /* First, free any non-default */
        for (i = 0; i < 256; i++) {
-               if ((spk_characters[i] != NULL)
-                   && (spk_characters[i] != spk_default_chars[i]))
+               if (spk_characters[i] &&
+                   (spk_characters[i] != spk_default_chars[i]))
                        kfree(spk_characters[i]);
        }
 
@@ -2096,8 +2096,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;