staging:speakup: Multiple checkpatch issues.
cover staging:speakup: Multiple checkpatch issues.
Improve readability by fixing multiple checkpatch.pl issues in speakup driver.
Arushi Singhal (2):
staging: speakup: Moved AND operator to previous line.
staging: speakup: spaces preferred around operator
drivers/staging/speakup/main.c | 8 ++++---- drivers/staging/speakup/speakup.h | 12 ++++++------ drivers/staging/speakup/speakup_acntpc.c | 2 +- drivers/staging/speakup/speakup_decpc.c | 20 ++++++++++---------- drivers/staging/speakup/speakup_dtlk.c | 2 +- drivers/staging/speakup/speakup_keypc.c | 6 +++--- drivers/staging/speakup/speakup_ltlk.c | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/2 staging: speakup: Moved AND operator to previous line.
Moved logical AND operator to previous line to fix the following checkpatch issue:
CHECK: Logical continuations should be on the previous line.
--- drivers/staging/speakup/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/speakup/main.c +4 -4
@@ -2173,10 +2173,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
Re: [Outreachy kernel] [PATCH 1/2] staging: speakup: Moved AND operator to previous line.
Quoted 2 lines · Arushi Singhal
Moved logical AND operator to previous line to fix the following checkpatch issue:
You seem to have AND and OR confused. AND is &&, OR is ||. This patch is about OR, not AND.
julia
Quoted 37 lines
CHECK: Logical continuations should be on the previous line.
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
-5@@ -2173,10 +2173,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 (); --2.11.0
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170319072403.10354-2-arushisinghal19971997%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
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.
--- drivers/staging/speakup/speakup.h | 12 ++++++------ drivers/staging/speakup/speakup_acntpc.c | 2 +- drivers/staging/speakup/speakup_decpc.c | 20 ++++++++++---------- drivers/staging/speakup/speakup_dtlk.c | 2 +- drivers/staging/speakup/speakup_keypc.c | 6 +++--- drivers/staging/speakup/speakup_ltlk.c | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-)
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 +1 -1
@@ -282,7 +282,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 ; } }
drivers/staging/speakup/speakup_decpc.c +10 -10
@@ -250,7 +250,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)
@@ -286,11 +286,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 )
@@ -318,8 +318,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))
@@ -337,8 +337,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 ; }
@@ -354,7 +354,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 +1 -1
@@ -300,7 +300,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 ;
drivers/staging/speakup/speakup_keypc.c +3 -3
@@ -142,9 +142,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 ; }
drivers/staging/speakup/speakup_ltlk.c +1 -1
@@ -145,7 +145,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