staging: speakup: Fix warning of line over 80 characters.
authorShirish Gajera <gshirishfree@gmail.com>
Sat, 28 Mar 2015 20:21:39 +0000 (13:21 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Apr 2015 11:43:45 +0000 (13:43 +0200)
This patch fixes the checkpatch.pl warning:
WARNING: line over 80 characters

All line over 80 characters in driver/staging/speakup/* are fixed.

Signed-off-by: Shirish Gajera <gshirishfree@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/main.c
drivers/staging/speakup/serialio.h
drivers/staging/speakup/speakup.h
drivers/staging/speakup/speakup_decext.c
drivers/staging/speakup/speakup_decpc.c
drivers/staging/speakup/spk_types.h

index 1249f910aed15343d74bf100e36474da1e94adf5..c955976414ee8d7f46d2eadb4e6e6e33063192fa 100644 (file)
@@ -423,7 +423,8 @@ static void announce_edge(struct vc_data *vc, int msg_id)
        if (spk_bleeps & 1)
                bleep(spk_y);
        if ((spk_bleeps & 2) && (msg_id < edge_quiet))
-               synth_printf("%s\n", spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
+               synth_printf("%s\n",
+                       spk_msg_get(MSG_EDGE_MSGS_START + msg_id - 1));
 }
 
 static void speak_char(u_char ch)
@@ -1131,7 +1132,8 @@ static void spkup_write(const char *in_buf, int count)
        if (in_count > 2 && rep_count > 2) {
                if (last_type & CH_RPT) {
                        synth_printf(" ");
-                       synth_printf(spk_msg_get(MSG_REPEAT_DESC2), ++rep_count);
+                       synth_printf(spk_msg_get(MSG_REPEAT_DESC2),
+                                       ++rep_count);
                        synth_printf(" ");
                }
                rep_count = 0;
@@ -1847,7 +1849,8 @@ static void speakup_win_set(struct vc_data *vc)
                        win_right = spk_x;
                }
                snprintf(info, sizeof(info), spk_msg_get(MSG_WINDOW_BOUNDARY),
-                        (win_start) ? spk_msg_get(MSG_END) : spk_msg_get(MSG_START),
+                        (win_start) ?
+                               spk_msg_get(MSG_END) : spk_msg_get(MSG_START),
                         (int)spk_y + 1, (int)spk_x + 1);
        }
        synth_printf("%s\n", info);
index 317bb8432a04251777cb5beee839b4607e739fa3..1b399214ecf7361ef5cf1ad83c650d0fb1bbc296 100644 (file)
@@ -34,6 +34,7 @@ struct old_serial_port {
 #define SPK_TIMEOUT 100
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
-#define spk_serial_tx_busy() ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)
+#define spk_serial_tx_busy() \
+       ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY)
 
 #endif
index 898dce5e1243e754a7dafd652d12ff53069b59f8..a7f4962427f36b98d54e98518e8259ff11f044c8 100644 (file)
@@ -61,10 +61,12 @@ extern struct st_var_header *spk_get_var_header(enum var_id_t var_id);
 extern struct st_var_header *spk_var_header_by_name(const char *name);
 extern struct punc_var_t *spk_get_punc_var(enum var_id_t var_id);
 extern int spk_set_num_var(int val, struct st_var_header *var, int how);
-extern int spk_set_string_var(const char *page, struct st_var_header *var, int len);
+extern int spk_set_string_var(const char *page, struct st_var_header *var,
+                               int len);
 extern int spk_set_mask_bits(const char *input, const int which, const int how);
 extern special_func spk_special_handler;
-extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key);
+extern int spk_handle_help(struct vc_data *vc, u_char type, u_char ch,
+                               u_short key);
 extern int synth_init(char *name);
 extern void synth_release(void);
 
index 2b772f8522f17ec84659e66db966b11422020623..e0b5db9bb46e6eb24af420a8370a6b264ced3c16 100644 (file)
@@ -207,10 +207,12 @@ static void do_catch_up(struct spk_synth *synth)
                        if (time_after_eq(jiffies, jiff_max)) {
                                if (!in_escape)
                                        spk_serial_out(PROCSPEECH);
-                               spin_lock_irqsave(&speakup_info.spinlock, flags);
+                               spin_lock_irqsave(&speakup_info.spinlock,
+                                                       flags);
                                jiffy_delta_val = jiffy_delta->u.n.value;
                                delay_time_val = delay_time->u.n.value;
-                               spin_unlock_irqrestore(&speakup_info.spinlock, flags);
+                               spin_unlock_irqrestore(&speakup_info.spinlock,
+                                                       flags);
                                schedule_timeout(msecs_to_jiffies
                                                 (delay_time_val));
                                jiff_max = jiffies + jiffy_delta_val;
index f7b9c8a3a1a59d776c121d01d473ff11a77c982c..437e13a85943dc00a0bbb7eb569eafe62589afb2 100644 (file)
@@ -423,10 +423,12 @@ static void do_catch_up(struct spk_synth *synth)
                        if (time_after_eq(jiffies, jiff_max)) {
                                if (!in_escape)
                                        dt_sendchar(PROCSPEECH);
-                               spin_lock_irqsave(&speakup_info.spinlock, flags);
+                               spin_lock_irqsave(&speakup_info.spinlock,
+                                                       flags);
                                jiffy_delta_val = jiffy_delta->u.n.value;
                                delay_time_val = delay_time->u.n.value;
-                               spin_unlock_irqrestore(&speakup_info.spinlock, flags);
+                               spin_unlock_irqrestore(&speakup_info.spinlock,
+                                                       flags);
                                schedule_timeout(msecs_to_jiffies
                                                 (delay_time_val));
                                jiff_max = jiffies + jiffy_delta_val;
index 55d6c9b3b4726e04101d2343abb32f7bbd1d653f..e8ff5d7d6419b3f8f53ccc5896c559eccfc83e45 100644 (file)
@@ -168,7 +168,8 @@ struct spk_synth {
        int *default_vol;
        int (*probe)(struct spk_synth *synth);
        void (*release)(void);
-       const char *(*synth_immediate)(struct spk_synth *synth, const char *buff);
+       const char *(*synth_immediate)(struct spk_synth *synth,
+                                       const char *buff);
        void (*catch_up)(struct spk_synth *synth);
        void (*flush)(struct spk_synth *synth);
        int (*is_alive)(struct spk_synth *synth);