Re: [PATCH] staging: speakup: Fix warning of line over 80 characters.

Richard Weinberger
2015-03-28T20:40:10Z

On Sat, Mar 28, 2015 at 9:21 PM, Shirish Gajera <gshirishfree@gmail.com> wrote:
> 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>
> ---
> drivers/staging/speakup/main.c | 9 ++++++---
> drivers/staging/speakup/serialio.h | 3 ++-
> drivers/staging/speakup/speakup.h | 6 ++++--
> drivers/staging/speakup/speakup_decext.c | 6 ++++--
> drivers/staging/speakup/speakup_decpc.c | 6 ++++--
> drivers/staging/speakup/spk_types.h | 3 ++-
> 6 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index 1249f91..c955976 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));

Instead of blindly adding newlines to silence checkpatch.pl, what
about reworking the code?
printf("%s\n", ..) cries for a puts().

> }
>
> 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(" ");

This printf stuff looks odd. synth_printf() seems to take a format
string, in this case the format string
is returned by spk_msg_get(), smells like a format string bug.

> }
> 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);

Same here. Also please resolve the ?: mess.

> }
> synth_printf("%s\n", info);
> diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
> index 317bb84..1b39921 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)

This makro is ugly in many ways.
Why can't this be an static inline function without a dependency on
global state?

>
> #endif
> diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h
> index 898dce5..a7f4962 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 2b772f8..e0b5db9 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 f7b9c8a..437e13a 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 55d6c9b..e8ff5d7 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);
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
Thanks,
//richard