6 files changed, 22 insertions, 11 deletions

diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 1249f910aed1..c955976414ee 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -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);
diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
index 317bb8432a04..1b399214ecf7 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -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
diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h
index 898dce5e1243..a7f4962427f3 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -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);
 
diff --git a/drivers/staging/speakup/speakup_decext.c b/drivers/staging/speakup/speakup_decext.c
index 2b772f8522f1..e0b5db9bb46e 100644
--- a/drivers/staging/speakup/speakup_decext.c
+++ b/drivers/staging/speakup/speakup_decext.c
@@ -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;
diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
index f7b9c8a3a1a5..437e13a85943 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -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;
diff --git a/drivers/staging/speakup/spk_types.h b/drivers/staging/speakup/spk_types.h
index 55d6c9b3b472..e8ff5d7d6419 100644
--- a/drivers/staging/speakup/spk_types.h
+++ b/drivers/staging/speakup/spk_types.h
@@ -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);