staging: speakup: checkpatch guided cleanups
cover staging: speakup: checkpatch guided cleanups
Improve readability by fixing multiple checkpatch.pl issues in speakup driver.
Arushi Singhal (2):
staging: speakup: Placed Logical on the previous line
staging: speakup: spaces preferred around operator
drivers/staging/speakup/main.c | 8 ++++---- 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 | 14 +++++++------- drivers/staging/speakup/speakup_dtlk.c | 14 +++++++------- drivers/staging/speakup/speakup_keypc.c | 12 ++++++------ drivers/staging/speakup/speakup_ltlk.c | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/2 staging: speakup: Placed Logical on the previous line
Placed Logical continuations on the previous line as reported by checkpatch.pl.
Signed-off-by Arushi Singhal <[email protected]>
--- drivers/staging/speakup/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/speakup/main.c +4 -4
@@ -2159,10 +2159,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/2 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.
Signed-off-by Arushi Singhal <[email protected]>
--- 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 | 14 +++++++------- drivers/staging/speakup/speakup_dtlk.c | 14 +++++++------- drivers/staging/speakup/speakup_keypc.c | 12 ++++++------ drivers/staging/speakup/speakup_ltlk.c | 2 +- 7 files changed, 31 insertions(+), 31 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,14 +30,14 @@#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)/* FIXME: u16 */ -#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
@@ -281,7 +281,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 ; } }
@@ -304,7 +304,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 +7 -7
@@ -249,7 +249,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)
@@ -271,7 +271,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 ); }
@@ -317,8 +317,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))
@@ -336,8 +336,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 ; }
@@ -353,7 +353,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 +7 -7
@@ -298,7 +298,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 ;
@@ -333,13 +333,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],
@@ -348,7 +348,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],
@@ -375,7 +375,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 ; }
@@ -241,7 +241,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 ;
@@ -269,7 +269,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 ; }
@@ -297,7 +297,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