Fix multiple checkpatch issues
cover Fix multiple checkpatch issues
Improve readability by fixing multiple checkpatch.pl issues in speakup driver.
Arushi Singhal (4):
staging: speakup: Placed Logical on the previous line
staging: speakup: spaces preferred around operator
staging: speakup: identation should use tabs
staging: speakup: Alignment should match open parenthesis
drivers/staging/speakup/kobjects.c | 16 ++++++++-------- drivers/staging/speakup/main.c | 10 +++++----- drivers/staging/speakup/selection.c | 2 +- drivers/staging/speakup/serialio.c | 6 +++--- drivers/staging/speakup/speakup.h | 12 ++++++------ drivers/staging/speakup/speakup_acntpc.c | 10 +++++----- drivers/staging/speakup/speakup_apollo.c | 2 +- drivers/staging/speakup/speakup_decext.c | 4 ++-- drivers/staging/speakup/speakup_decpc.c | 22 +++++++++++----------- drivers/staging/speakup/speakup_dtlk.c | 16 ++++++++-------- drivers/staging/speakup/speakup_dtlk.h | 10 +++++----- drivers/staging/speakup/speakup_keypc.c | 12 ++++++------ drivers/staging/speakup/speakup_ltlk.c | 2 +- 13 files changed, 62 insertions(+), 62 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/4 staging: speakup: Placed Logical on the previous line
Placed Logical continuations on the previous line as reported by checkpatch.pl.
--- drivers/staging/speakup/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/speakup/main.c +4 -4
@@ -2144,10 +2144,10 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,if (up_flag || spk_killed || type ==KT_SHIFT ) goto out; spk_shut_up &=0xfe ; - kh = (value ==KVAL (K_DOWN )) - || (value ==KVAL (K_UP )) - || (value ==KVAL (K_LEFT )) - || (value ==KVAL (K_RIGHT )); + kh = (value ==KVAL (K_DOWN )) || + (value ==KVAL (K_UP )) || + (value ==KVAL (K_LEFT )) || + (value ==KVAL (K_RIGHT ));if ((cursor_track != read_all_mode) || !kh)if (!spk_no_intr)spk_do_flush ();
Signature · 1 line
2.11.0
PATCH 2/4 staging: speakup: spaces preferred around operator
In reply to Arushi SinghalFixed the checkpatch.pl issues like:
CHECK: spaces preferred around that '&' (ctx:VxV)
CHECK: spaces preferred around that '|' (ctx:VxV)
CHECK: spaces preferred around that '-' (ctx:VxV)
CHECK: spaces preferred around that '+' (ctx:VxV) etc.
--- drivers/staging/speakup/serialio.c | 4 ++-- drivers/staging/speakup/speakup.h | 12 ++++++------ drivers/staging/speakup/speakup_acntpc.c | 4 ++-- drivers/staging/speakup/speakup_decpc.c | 22 +++++++++++----------- drivers/staging/speakup/speakup_dtlk.c | 16 ++++++++-------- drivers/staging/speakup/speakup_keypc.c | 12 ++++++------ drivers/staging/speakup/speakup_ltlk.c | 2 +- 7 files changed, 36 insertions(+), 36 deletions(-)
drivers/staging/speakup/serialio.c +2 -2
@@ -120,8 +120,8 @@ static void start_serial_interrupt(int irq)outb (UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 , speakup_info.port_tts +UART_MCR );/* Turn on Interrupts */ -outb (UART_IER_MSI |UART_IER_RLSI |UART_IER_RDI , - speakup_info.port_tts +UART_IER ); +outb (UART_IER_MSI |UART_IER_RLSI |UART_IER_RDI , + speakup_info.port_tts +UART_IER );inb (speakup_info.port_tts +UART_LSR );inb (speakup_info.port_tts +UART_RX );inb (speakup_info.port_tts +UART_IIR );
drivers/staging/speakup/speakup.h +6 -6
@@ -20,7 +20,7 @@#define A_CAP 0x0007#define B_NUM 0x0008#define NUM 0x0009 -#define ALPHANUM (B_ALPHA|B_NUM) +#define ALPHANUM (B_ALPHA | B_NUM)#define SOME 0x0010#define MOST 0x0020#define PUNC 0x0040
@@ -30,13 +30,13 @@#define B_EXNUM 0x0100#define CH_RPT 0x0200#define B_CTL 0x0400 -#define A_CTL (B_CTL+SYNTH_OK) +#define A_CTL (B_CTL + SYNTH_OK)#define B_SYM 0x0800 -#define B_CAPSYM (B_CAP|B_SYM) +#define B_CAPSYM (B_CAP | B_SYM) -#define IS_WDLM (x) (spk_chartab[((u_char)x)]&B_WDLM) -#define IS_CHAR (x, type) (spk_chartab[((u_char)x)]&type) -#define IS_TYPE (x, type) ((spk_chartab[((u_char)x)]&type) == type) +#define IS_WDLM (x) (spk_chartab[((u_char)x)] & B_WDLM) +#define IS_CHAR (x, type) (spk_chartab[((u_char)x)] & type) +#define IS_TYPE (x, type) ((spk_chartab[((u_char)x)] & type) == type)int speakup_thread (void *data);void spk_reset_default_chars (void );
drivers/staging/speakup/speakup_acntpc.c +2 -2
@@ -280,7 +280,7 @@ static int synth_probe(struct spk_synth *synth)if (port_val ==0x53fc ) {/* 'S' and out&input bits */ synth_port_control = synth_portlist[i]; - speakup_info.port_tts = synth_port_control+1 ; + speakup_info.port_tts = synth_port_control +1 ;break ; } }
@@ -303,7 +303,7 @@ static int synth_probe(struct spk_synth *synth)static void accent_release (void ) {if (speakup_info.port_tts) -synth_release_region (speakup_info.port_tts-1 ,SYNTH_IO_EXTENT ); +synth_release_region (speakup_info.port_tts -1 ,SYNTH_IO_EXTENT ); speakup_info.port_tts =0 ; }
drivers/staging/speakup/speakup_decpc.c +11 -11
@@ -251,7 +251,7 @@ static int dt_getstatus(void)static void dt_sendcmd (u_int cmd) {outb_p (cmd &0xFF , speakup_info.port_tts); -outb_p ((cmd >>8 ) &0xFF , speakup_info.port_tts+1 ); +outb_p ((cmd >>8 ) &0xFF , speakup_info.port_tts +1 ); }static int dt_waitbit (int bit)
@@ -273,7 +273,7 @@ static int dt_wait_dma(void)if (!dt_waitbit (STAT_dma_ready))return 0 ;while (--timeout >0 ) { -if ((dt_getstatus ()&STAT_dma_state) == state) +if ((dt_getstatus () & STAT_dma_state) == state)return 1 ;udelay (50 ); }
@@ -287,11 +287,11 @@ static int dt_ctrl(u_int cmd)if (!dt_waitbit (STAT_cmd_ready))return -1 ; -outb_p (0 , speakup_info.port_tts+2 ); -outb_p (0 , speakup_info.port_tts+3 ); +outb_p (0 , speakup_info.port_tts +2 ); +outb_p (0 , speakup_info.port_tts +3 );dt_getstatus (); -dt_sendcmd (CMD_control|cmd); -outb_p (0 , speakup_info.port_tts+6 ); +dt_sendcmd (CMD_control | cmd); +outb_p (0 , speakup_info.port_tts +6 );while (dt_getstatus () & STAT_cmd_ready) {udelay (20 );if (--timeout ==0 )
@@ -319,8 +319,8 @@ udelay(50);break ;udelay (50 ); } -outb_p (DMA_sync, speakup_info.port_tts+4 ); -outb_p (0 , speakup_info.port_tts+4 ); +outb_p (DMA_sync, speakup_info.port_tts +4 ); +outb_p (0 , speakup_info.port_tts +4 );udelay (100 );for (timeout =0 ; timeout <10 ; timeout++) {if (!(dt_getstatus () & STAT_flushing))
@@ -338,8 +338,8 @@ static int dt_sendchar(char ch)return -1 ;if (!(dt_stat & STAT_rr_char))return -2 ; -outb_p (DMA_single_in, speakup_info.port_tts+4 ); -outb_p (ch, speakup_info.port_tts+4 ); +outb_p (DMA_single_in, speakup_info.port_tts +4 ); +outb_p (ch, speakup_info.port_tts +4 ); dma_state ^= STAT_dma_state;return 0 ; }
@@ -355,7 +355,7 @@ static int testkernel(void)dt_sendcmd (CMD_sync);if (!dt_waitbit (STAT_cmd_ready)) status =-2 ; -else if (dt_stat&0x8000 ) +else if (dt_stat &0x8000 )return 0 ;else if (dt_stat ==0x0dec ) pr_warn("dec_pc at 0x%x, software not loaded\n",
drivers/staging/speakup/speakup_dtlk.c +8 -8
@@ -297,7 +297,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) t +=2 ;for (i =0 ; *t !='\r' ; t++) { status.rom_version[i] = *t; -if (i <sizeof (status.rom_version)-1 ) +if (i <sizeof (status.rom_version) -1 ) i++; } status.rom_version[i] =0 ;
@@ -332,13 +332,13 @@ static int synth_probe(struct spk_synth *synth) speakup_info.port_tts);if ((port_forced &0xf ) !=0xf )pr_info ("warning: port base should probably end with f\n" ); -if (synth_request_region (speakup_info.port_tts-1 , -SYNTH_IO_EXTENT )) { +if (synth_request_region (speakup_info.port_tts -1 , +SYNTH_IO_EXTENT )) {pr_warn ("sorry, port already reserved\n" );return -EBUSY ; } - port_val =inw (speakup_info.port_tts-1 ); - synth_lpc = speakup_info.port_tts-1 ; + port_val =inw (speakup_info.port_tts -1 ); + synth_lpc = speakup_info.port_tts -1 ; }else {for (i =0 ; synth_portlist[i]; i++) { if (synth_request_region(synth_portlist[i],
@@ -347,7 +347,7 @@ static int synth_probe(struct spk_synth *synth) port_val =inw (synth_portlist[i]) &0xfbff ;if (port_val ==0x107f ) { synth_lpc = synth_portlist[i]; - speakup_info.port_tts = synth_lpc+1 ; + speakup_info.port_tts = synth_lpc +1 ;break ; } synth_release_region(synth_portlist[i],
@@ -365,7 +365,7 @@ static int synth_probe(struct spk_synth *synth)cpu_relax ();/* wait until it's ready */ sp =synth_interrogate (synth);pr_info ("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n" , - synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT -1 , + synth->long_name, synth_lpc, synth_lpc +SYNTH_IO_EXTENT -1 , sp->rom_version, sp->serial_number, synth->version); synth->alive =1 ;return 0 ;
@@ -374,7 +374,7 @@ static int synth_probe(struct spk_synth *synth)static void dtlk_release (void ) {if (speakup_info.port_tts) -synth_release_region (speakup_info.port_tts-1 ,SYNTH_IO_EXTENT ); +synth_release_region (speakup_info.port_tts -1 ,SYNTH_IO_EXTENT ); speakup_info.port_tts =0 ; }
drivers/staging/speakup/speakup_keypc.c +6 -6
@@ -141,9 +141,9 @@ static char *oops(void)int s1, s2, s3, s4; s1 =inb_p (synth_port); - s2 =inb_p (synth_port+1 ); - s3 =inb_p (synth_port+2 ); - s4 =inb_p (synth_port+3 ); + s2 =inb_p (synth_port +1 ); + s3 =inb_p (synth_port +2 ); + s4 =inb_p (synth_port +3 );pr_warn ("synth timeout %d %d %d %d\n" , s1, s2, s3, s4);return NULL ; }
@@ -240,7 +240,7 @@ spin_lock_irqsave(&speakup_info.spinlock, flags); delay_time_val = delay_time->u.n.value;spin_unlock_irqrestore (&speakup_info.spinlock, flags);schedule_timeout (msecs_to_jiffies (delay_time_val)); - jiff_max = jiffies+jiffy_delta_val; + jiff_max = jiffies + jiffy_delta_val; } } timeout =1000 ;
@@ -268,7 +268,7 @@ static int synth_probe(struct spk_synth *synth) synth_port = port_forced;pr_info ("probe forced to %x by kernel command line\n" , synth_port); -if (synth_request_region (synth_port-1 ,SYNTH_IO_EXTENT )) { +if (synth_request_region (synth_port -1 ,SYNTH_IO_EXTENT )) {pr_warn ("sorry, port already reserved\n" );return -EBUSY ; }
@@ -296,7 +296,7 @@ static int synth_probe(struct spk_synth *synth)return -ENODEV ; }pr_info ("%s: %03x-%03x, driver version %s,\n" , synth->long_name, - synth_port, synth_port+SYNTH_IO_EXTENT -1 , + synth_port, synth_port +SYNTH_IO_EXTENT -1 , synth->version); synth->alive =1 ;return 0 ;
drivers/staging/speakup/speakup_ltlk.c +1 -1
@@ -144,7 +144,7 @@ static void synth_interrogate(struct spk_synth *synth)if (i >2 && buf[i] ==0x7f )break ; } - t = buf+2 ; + t = buf +2 ;for (i =0 ; *t !='\r' ; t++) { rom_v[i] = *t;if (++i >=19 )
Signature · 1 line
2.11.0
PATCH 3/4 staging: speakup: identation should use tabs
In reply to Arushi SinghalIndentation should always use tabs and never spaces.
--- drivers/staging/speakup/speakup_dtlk.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/speakup/speakup_dtlk.h +5 -5
@@ -24,11 +24,11 @@* usec later. */ #define TTS_ALMOST_FULL 0x08/* mask for AF bit: When set to 1, -* indicates that less than 300 bytes -* are available in the TTS input -* buffer. AF is always 0 in the PCM, -* TGN and CVSD modes. -*/ +* indicates that less than 300 bytes +* are available in the TTS input +* buffer. AF is always 0 in the PCM, +* TGN and CVSD modes. +*/ #define TTS_ALMOST_EMPTY 0x04/* mask for AE bit: When set to 1, * indicates that less than 300 bytes * are remaining in DoubleTalk's input
Signature · 1 line
2.11.0
PATCH 4/4 staging: speakup: Alignment should match open parenthesis
In reply to Arushi SinghalFix checkpatch issues: "CHECK: Alignment should match open parenthesis".
--- drivers/staging/speakup/kobjects.c | 16 ++++++++-------- drivers/staging/speakup/main.c | 2 +- drivers/staging/speakup/selection.c | 2 +- drivers/staging/speakup/serialio.c | 2 +- drivers/staging/speakup/speakup_acntpc.c | 6 +++--- drivers/staging/speakup/speakup_apollo.c | 2 +- drivers/staging/speakup/speakup_decext.c | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-)
drivers/staging/speakup/kobjects.c +8 -8
@@ -662,9 +662,9 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, var_data = param->data; value = var_data->u.n.value;spk_reset_default_value ("pitch" , synth->default_pitch, - value); + value);spk_reset_default_value ("vol" , synth->default_vol, - value); + value); }break ;case VAR_STRING :
@@ -679,7 +679,7 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, ret =spk_set_string_var (cp, param, len);if (ret == -E2BIG )pr_warn ("value too long for %s\n" , - param->name); + param->name);break ;default : pr_warn("%s unknown type %d\n",
@@ -699,7 +699,7 @@ EXPORT_SYMBOL_GPL(spk_var_store);*/ static ssize_t message_show_helper (char *buf,enum msg_index_t first, -enum msg_index_t last) +enum msg_index_t last) {size_t bufsize =PAGE_SIZE ;char *buf_pointer = buf;
@@ -712,7 +712,7 @@ static ssize_t message_show_helper(char *buf, enum msg_index_t first,if (bufsize <=1 )break ; printed =scnprintf (buf_pointer, bufsize,"%d\t%s\n" , - index,spk_msg_get (cursor)); + index,spk_msg_get (cursor)); buf_pointer += printed; bufsize -= printed; }
@@ -721,7 +721,7 @@ static ssize_t message_show_helper(char *buf, enum msg_index_t first, }static void report_msg_status (int reset,int received,int used, -int rejected,char *groupname) +int rejected,char *groupname) {int len;char buf[160 ];
@@ -742,7 +742,7 @@ static void report_msg_status(int reset, int received, int used, }static ssize_t message_store_helper (const char *buf,size_t count, -struct msg_group_t *group) +struct msg_group_t *group) {char *cp = (char *) buf;char *end = cp + count;
@@ -843,7 +843,7 @@ static ssize_t message_show(struct kobject *kobj, }static ssize_t message_store (struct kobject *kobj,struct kobj_attribute *attr, -const char *buf,size_t count) +const char *buf,size_t count) {struct msg_group_t *group =spk_find_msg_group (attr->attr.name);
drivers/staging/speakup/main.c +1 -1
@@ -1140,7 +1140,7 @@ static void spkup_write(const char *in_buf, int count)if (last_type &CH_RPT ) {synth_printf (" " );synth_printf (spk_msg_get (MSG_REPEAT_DESC2 ), - ++rep_count); + ++rep_count);synth_printf (" " ); } rep_count =0 ;
drivers/staging/speakup/selection.c +1 -1
@@ -75,7 +75,7 @@ int speakup_set_selection(struct tty_struct *tty)speakup_clear_selection (); spk_sel_cons = vc_cons[fg_console].d;dev_warn (tty->dev, -"Selection: mark console not the same as cut\n" ); +"Selection: mark console not the same as cut\n" );return -EINVAL ; }
drivers/staging/speakup/serialio.c +1 -1
@@ -118,7 +118,7 @@ static void start_serial_interrupt(int irq)pr_err ("Unable to request Speakup serial I R Q\n" );/* Set MCR */ outb (UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 , - speakup_info.port_tts +UART_MCR ); + speakup_info.port_tts +UART_MCR );/* Turn on Interrupts */ outb (UART_IER_MSI |UART_IER_RLSI |UART_IER_RDI , speakup_info.port_tts +UART_IER );
drivers/staging/speakup/speakup_acntpc.c +3 -3
@@ -259,9 +259,9 @@ static int synth_probe(struct spk_synth *synth)if (port_forced) { speakup_info.port_tts = port_forced;pr_info ("probe forced to %x by kernel command line\n" , - speakup_info.port_tts); + speakup_info.port_tts);if (synth_request_region (speakup_info.port_tts -1 , -SYNTH_IO_EXTENT )) { +SYNTH_IO_EXTENT )) {pr_warn ("sorry, port already reserved\n" );return -EBUSY ; }
@@ -270,7 +270,7 @@ static int synth_probe(struct spk_synth *synth) }else {for (i =0 ; synth_portlist[i]; i++) {if (synth_request_region (synth_portlist[i], -SYNTH_IO_EXTENT )) { +SYNTH_IO_EXTENT )) {pr_warn ("request_region: failed with 0x%x, %d\n" , synth_portlist[i],SYNTH_IO_EXTENT );
drivers/staging/speakup/speakup_apollo.c +1 -1
@@ -171,7 +171,7 @@ static void do_catch_up(struct spk_synth *synth)if (!spk_serial_out (ch)) {outb (UART_MCR_DTR , speakup_info.port_tts +UART_MCR );outb (UART_MCR_DTR |UART_MCR_RTS , - speakup_info.port_tts +UART_MCR ); + speakup_info.port_tts +UART_MCR );schedule_timeout (msecs_to_jiffies (full_time_val));continue ; }
drivers/staging/speakup/speakup_decext.c +2 -2
@@ -204,11 +204,11 @@ static void do_catch_up(struct spk_synth *synth)if (!in_escape)spk_serial_out (PROCSPEECH );spin_lock_irqsave (&speakup_info.spinlock, - flags); + flags); jiffy_delta_val = jiffy_delta->u.n.value; delay_time_val = delay_time->u.n.value;spin_unlock_irqrestore (&speakup_info.spinlock, - flags); + flags);schedule_timeout (msecs_to_jiffies (delay_time_val)); jiff_max = jiffies + jiffy_delta_val;
Signature · 1 line
2.11.0
Looks good. Thanks.
regards,
dan carpenter