Cleanup in staging speakup driver
v2 cover Cleanup in staging speakup driver
Do coding style cleanup to improve readability and maintainability.
Change in v2:
- Change commit message to begin with capital letter.
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 v2 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.
---
Change in v2:
- Change the commit message to begin with capital letter.
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
PATCH v2 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 v2 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
Actually, you should put a v2 in every patch, saying that nothing has changed if that is the case. Sorry that the tutorial is not more clearon this point.
julia
Quoted 5 lines · Julia Lawall
Actually, you should put a v2 in every patch, saying that nothing has changed if that is the case. Sorry that the tutorial is not more clearon this point.
julia
I have added the note in all patches. Please check if it's in the proper format.
Best,
Santha
Quoted 5 lines · Julia Lawall
Actually, you should put a v2 in every patch, saying that nothing has changed if that is the case. Sorry that the tutorial is not more clearon this point.
julia
Hi,
I noticed that I misspelled 'begin' in commit message (my bad) and that the logs should be rephrased. Should I change it to 'Changes since v1' or should I include what has been changed in every version? I'm really sorry for the confusion.