Cleanup in staging speakup driver
cover Cleanup in staging speakup driver
Do coding style cleanup to improve readability and maintainability.
Santha Meena Ramamoorthy (3):
staging: speakup: add spaces around arithmetic operators
staging: speakup: match alignment with open paranthesis
staging: speakup: remove space after a cast
drivers/staging/speakup/speakup_dtlk.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 staging: speakup: add spaces around arithmetic operators
add space around arithmetic operators ('+', '-' and '*') to conform to Linux kernel coding style. Problem found using checkpatch.
--- drivers/staging/speakup/speakup_dtlk.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/staging/speakup/speakup_dtlk.c +8 -7
@@ -287,7 +287,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) } t = buf;/* serial number is little endian */ - status.serial_number = t[0 ] + t[1 ]*256 ; + status.serial_number = t[0 ] + t[1 ] *256 ; t +=2 ;for (i =0 ; *t !='\r' ; t++) { status.rom_version[i] = *t;
@@ -326,13 +326,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 , +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],
@@ -341,7 +341,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],
@@ -359,7 +359,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 ;
@@ -369,7 +369,8 @@ static void dtlk_release(void) {spk_stop_serial_interrupt ();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 ; }
Signature · 1 line
2.7.4
Re: [Outreachy kernel] [PATCH 1/3] staging: speakup: add spaces around arithmetic operators
Quoted 2 lines · Santha Meena Ramamoorthy
add space around arithmetic operators ('+', '-' and '*') to conform to Linux kernel coding style. Problem found using checkpatch.
Could you update this one to start the log message with a capital letter?
You will need to send the whole series again, and note where things changes and where they did not. See the tutorial.
thanks,
julia
Quoted 74 lines
Signed-off-by Santha Meena Ramamoorthy <[email protected]>--- drivers/staging/speakup/speakup_dtlk.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/staging/speakup/speakup_dtlk.c +8
-8@@ -287,7 +287,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) } t = buf;/* serial number is little endian */ - status.serial_number = t[0 ] + t[1 ]*256 ; + status.serial_number = t[0 ] + t[1 ] *256 ; t +=2 ;for (i =0 ; *t !='\r' ; t++) { status.rom_version[i] = *t;@@ -326,13 +326,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 , +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],@@ -341,7 +341,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],@@ -359,7 +359,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 ;@@ -369,7 +369,8 @@ static void dtlk_release(void) {spk_stop_serial_interrupt ();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 ; } --2.7.4
--
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/1519239357-9527-2-git-send-email-santhameena13%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
Re: [Outreachy kernel] [PATCH 1/3] staging: speakup: add spaces around arithmetic operators
Quoted 7 lines · Julia Lawall
Quoted 2 lines · Santha Meena Ramamoorthy
add space around arithmetic operators ('+', '-' and '*') to conform to Linux kernel coding style. Problem found using checkpatch.
Quoted 7 lines
Could you update this one to start the log message with a capital letter?
You will need to send the whole series again, and note where things changes and where they did not. See the tutorial.
thanks,
julia
Sorry for the silly mistake. I have changed it and submitted v2. Thanks :)
Quoted 74 lines
Quoted 74 lines
Signed-off-by Santha Meena Ramamoorthy <[email protected]>--- drivers/staging/speakup/speakup_dtlk.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)drivers/staging/speakup/speakup_dtlk.c +8
-8@@ -287,7 +287,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) } t = buf;/* serial number is little endian */ - status.serial_number = t[0 ] + t[1 ]*256 ; + status.serial_number = t[0 ] + t[1 ] *256 ; t +=2 ;for (i =0 ; *t !='\r' ; t++) { status.rom_version[i] = *t;@@ -326,13 +326,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 , +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],@@ -341,7 +341,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],@@ -359,7 +359,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 ;@@ -369,7 +369,8 @@ static void dtlk_release(void) {spk_stop_serial_interrupt ();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 ; } --2.7.4
--
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/1519239357-9527-2-git-send-email-santhameena13%40gmail.com.
For more options, visit https://groups.google.com/d/optout.
PATCH 2/3 staging: speakup: match alignment with open paranthesis
In reply to Santha Meena RamamoorthyMatch alignment with open paranthesis to conform to Linux kernel coding style. Problem found using checkpatch.
--- drivers/staging/speakup/speakup_dtlk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/speakup/speakup_dtlk.c +4 -4
@@ -323,11 +323,11 @@ 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 ((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 )) { +SYNTH_IO_EXTENT )) {pr_warn ("sorry, port already reserved\n" );return -EBUSY ; }
@@ -336,7 +336,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 ))continue ; port_val =inw (synth_portlist[i]) &0xfbff ;if (port_val ==0x107f ) {
@@ -345,7 +345,7 @@ static int synth_probe(struct spk_synth *synth)break ; }synth_release_region (synth_portlist[i], -SYNTH_IO_EXTENT ); +SYNTH_IO_EXTENT ); } } port_val &=0xfbff ;
Signature · 1 line
2.7.4
PATCH 3/3 staging: speakup: remove space after a cast
In reply to Santha Meena RamamoorthyRemove blank space after a cast to conform to Linux kernel coding style. Problem found using checkpatch.
--- drivers/staging/speakup/speakup_dtlk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/speakup/speakup_dtlk.c +1 -1
@@ -266,7 +266,7 @@ static char synth_read_tts(void)outb_p (ch, speakup_info.port_tts);while (synth_readable ())cpu_relax (); -return (char ) ch; +return (char )ch; }/* interrogate the DoubleTalk PC and return its settings */
Signature · 1 line
2.7.4