Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: speakup: Fix warning reported by checkpatch

This patch fixes the checkpatch.pl warnings:
WARNING: Block comments use a trailing */ on a separate line
WARNING: Block comments use * on subsequent lines

Signed-off-by: Aleksey Fedotov <lexa@cfotr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Aleksei Fedotov and committed by
Greg Kroah-Hartman
13d825ed ad9f92d2

+66 -44
+2 -1
drivers/staging/speakup/buffers.c
··· 63 63 { 64 64 if (!synth->alive) { 65 65 /* This makes sure that we won't stop TTYs if there is no synth 66 - * to restart them */ 66 + * to restart them 67 + */ 67 68 return; 68 69 } 69 70 if (synth_buffer_free() <= 100) {
+2 -1
drivers/staging/speakup/i18n.c
··· 1 1 /* Internationalization implementation. Includes definitions of English 2 - * string arrays, and the i18n pointer. */ 2 + * string arrays, and the i18n pointer. 3 + */ 3 4 4 5 #include <linux/slab.h> /* For kmalloc. */ 5 6 #include <linux/ctype.h>
+2 -1
drivers/staging/speakup/kobjects.c
··· 240 240 cp += sprintf(cp, "%d, %d, %d,\n", KEY_MAP_VER, num_keys, nstates); 241 241 cp1 += 2; /* now pointing at shift states */ 242 242 /* dump num_keys+1 as first row is shift states + flags, 243 - * each subsequent row is key + states */ 243 + * each subsequent row is key + states 244 + */ 244 245 for (n = 0; n <= num_keys; n++) { 245 246 for (i = 0; i <= nstates; i++) { 246 247 ch = *cp1++;
+10 -5
drivers/staging/speakup/main.c
··· 128 128 129 129 /* array of 256 char pointers (one for each character description) 130 130 * initialized to default_chars and user selectable via 131 - * /proc/speakup/characters */ 131 + * /proc/speakup/characters 132 + */ 132 133 char *spk_characters[256]; 133 134 134 135 char *spk_default_chars[256] = { ··· 195 194 196 195 /* array of 256 u_short (one for each character) 197 196 * initialized to default_chartab and user selectable via 198 - * /sys/module/speakup/parameters/chartab */ 197 + * /sys/module/speakup/parameters/chartab 198 + */ 199 199 u_short spk_chartab[256]; 200 200 201 201 static u_short default_chartab[256] = { ··· 542 540 * see if there is a word starting on the next position to the right 543 541 * and return that word if it exists. If it does not exist it will 544 542 * move left to the beginning of any previous word on the line or the 545 - * beginning off the line whichever comes first.. */ 543 + * beginning off the line whichever comes first.. 544 + */ 546 545 547 546 static u_long get_word(struct vc_data *vc) 548 547 { ··· 1116 1113 * suppress multiple to get rid of long pauses and 1117 1114 * clear repeat count 1118 1115 * so if someone has 1119 - * repeats on you don't get nothing repeated count */ 1116 + * repeats on you don't get nothing repeated count 1117 + */ 1120 1118 if (ch != old_ch) 1121 1119 synth_printf("%c", ch); 1122 1120 else ··· 1513 1509 if (spk_no_intr) 1514 1510 spk_do_flush(); 1515 1511 /* the key press flushes if !no_inter but we want to flush on cursor 1516 - * moves regardless of no_inter state */ 1512 + * moves regardless of no_inter state 1513 + */ 1517 1514 is_cursor = value + 1; 1518 1515 old_cursor_pos = vc->vc_pos; 1519 1516 old_cursor_x = vc->vc_x;
+2 -1
drivers/staging/speakup/selection.c
··· 114 114 obp = bp; 115 115 if (!((i + 2) % vc->vc_size_row)) { 116 116 /* strip trailing blanks from line and add newline, 117 - unless non-space at end of line. */ 117 + * unless non-space at end of line. 118 + */ 118 119 if (obp != bp) { 119 120 bp = obp; 120 121 *bp++ = '\r';
+6 -4
drivers/staging/speakup/serialio.c
··· 51 51 } 52 52 53 53 /* Disable UART interrupts, set DTR and RTS high 54 - * and set speed. */ 54 + * and set speed. 55 + */ 55 56 outb(cval | UART_LCR_DLAB, ser->port + UART_LCR); /* set DLAB */ 56 57 outb(quot & 0xff, ser->port + UART_DLL); /* LS of divisor */ 57 58 outb(quot >> 8, ser->port + UART_DLM); /* MS of divisor */ ··· 146 145 synth->alive = 0; 147 146 /* No synth any more, so nobody will restart TTYs, and we thus 148 147 * need to do it ourselves. Now that there is no synth we can 149 - * let application flood anyway */ 148 + * let application flood anyway 149 + */ 150 150 speakup_start_ttys(); 151 151 timeouts = 0; 152 152 return 0; ··· 165 163 /* CTS */ 166 164 if (--tmout == 0) { 167 165 /* pr_warn("%s: timed out (cts)\n", 168 - * synth->long_name); */ 166 + * synth->long_name); 167 + */ 169 168 timeouts++; 170 169 return 0; 171 170 } ··· 220 217 speakup_info.port_tts = 0; 221 218 } 222 219 EXPORT_SYMBOL_GPL(spk_serial_release); 223 -
+5 -3
drivers/staging/speakup/speakup_acnt.h
··· 6 6 7 7 /* Port Status Flags */ 8 8 #define SYNTH_READABLE 0x01 /* mask for bit which is nonzero if a 9 - byte can be read from the data port */ 9 + * byte can be read from the data port 10 + */ 10 11 #define SYNTH_WRITABLE 0x02 /* mask for RDY bit, which when set to 11 - 1, indicates the data port is ready 12 - to accept a byte of data. */ 12 + * 1, indicates the data port is ready 13 + * to accept a byte of data. 14 + */ 13 15 #define SYNTH_QUIET 'S' /* synth is not speaking */ 14 16 #define SYNTH_FULL 'F' /* synth is full. */ 15 17 #define SYNTH_ALMOST_EMPTY 'M' /* synth has less than 2 seconds of text left */
+3 -3
drivers/staging/speakup/speakup_decpc.c
··· 88 88 #define CTRL_last_index 0x0b00 /* get last index spoken */ 89 89 #define CTRL_io_priority 0x0c00 /* change i/o priority */ 90 90 #define CTRL_free_mem 0x0d00 /* get free paragraphs on module */ 91 - #define CTRL_get_lang 0x0e00 /* return bit mask of loaded 92 - * languages */ 91 + #define CTRL_get_lang 0x0e00 /* return bit mask of loaded 92 + * languages 93 + */ 93 94 #define CMD_test 0x2000 /* self-test request */ 94 95 #define TEST_mask 0x0F00 /* isolate test field */ 95 96 #define TEST_null 0x0000 /* no test requested */ ··· 501 500 MODULE_DESCRIPTION("Speakup support for DECtalk PC synthesizers"); 502 501 MODULE_LICENSE("GPL"); 503 502 MODULE_VERSION(DRV_VERSION); 504 -
+30 -22
drivers/staging/speakup/speakup_dtlk.h
··· 4 4 #define SYNTH_CLEAR 0x18 /* stops speech */ 5 5 /* TTS Port Status Flags */ 6 6 #define TTS_READABLE 0x80 /* mask for bit which is nonzero if a 7 - byte can be read from the TTS port */ 7 + * byte can be read from the TTS port 8 + */ 8 9 #define TTS_SPEAKING 0x40 /* mask for SYNC bit, which is nonzero 9 - while DoubleTalk is producing 10 - output with TTS, PCM or CVSD 11 - synthesizers or tone generators 12 - (that is, all but LPC) */ 10 + * while DoubleTalk is producing 11 + * output with TTS, PCM or CVSD 12 + * synthesizers or tone generators 13 + * (that is, all but LPC) 14 + */ 13 15 #define TTS_SPEAKING2 0x20 /* mask for SYNC2 bit, 14 - which falls to zero up to 0.4 sec 15 - before speech stops */ 16 + * which falls to zero up to 0.4 sec 17 + * before speech stops 18 + */ 16 19 #define TTS_WRITABLE 0x10 /* mask for RDY bit, which when set to 17 - 1, indicates the TTS port is ready 18 - to accept a byte of data. The RDY 19 - bit goes zero 2-3 usec after 20 - writing, and goes 1 again 180-190 21 - usec later. */ 20 + * 1, indicates the TTS port is ready 21 + * to accept a byte of data. The RDY 22 + * bit goes zero 2-3 usec after 23 + * writing, and goes 1 again 180-190 24 + * usec later. 25 + */ 22 26 #define TTS_ALMOST_FULL 0x08 /* mask for AF bit: When set to 1, 23 - indicates that less than 300 bytes 24 - are available in the TTS input 25 - buffer. AF is always 0 in the PCM, 26 - TGN and CVSD modes. */ 27 + * indicates that less than 300 bytes 28 + * are available in the TTS input 29 + * buffer. AF is always 0 in the PCM, 30 + * TGN and CVSD modes. 31 + */ 27 32 #define TTS_ALMOST_EMPTY 0x04 /* mask for AE bit: When set to 1, 28 - indicates that less than 300 bytes 29 - are remaining in DoubleTalk's input 30 - (TTS or PCM) buffer. AE is always 1 31 - in the TGN and CVSD modes. */ 33 + * indicates that less than 300 bytes 34 + * are remaining in DoubleTalk's input 35 + * (TTS or PCM) buffer. AE is always 1 36 + * in the TGN and CVSD modes. 37 + */ 32 38 33 39 /* data returned by Interrogate command */ 34 40 struct synth_settings { ··· 51 45 u_char ext_dict_loaded; /* 1=exception dictionary loaded */ 52 46 u_char ext_dict_status; /* 1=exception dictionary enabled */ 53 47 u_char free_ram; /* # pages (truncated) remaining for 54 - * text buffer */ 48 + * text buffer 49 + */ 55 50 u_char articulation; /* nA; 0-9 */ 56 51 u_char reverb; /* nR; 0-9 */ 57 52 u_char eob; /* 7Fh value indicating end of 58 - * parameter block */ 53 + * parameter block 54 + */ 59 55 u_char has_indexing; /* nonzero if indexing is implemented */ 60 56 };
-1
drivers/staging/speakup/speakup_soft.c
··· 356 356 MODULE_DESCRIPTION("Speakup userspace software synthesizer support"); 357 357 MODULE_LICENSE("GPL"); 358 358 MODULE_VERSION(DRV_VERSION); 359 -
+2 -1
drivers/staging/speakup/thread.c
··· 48 48 kd_mksound(our_sound.freq, our_sound.jiffies); 49 49 if (synth && synth->catch_up && synth->alive) { 50 50 /* It is up to the callee to take the lock, so that it 51 - * can sleep whenever it likes */ 51 + * can sleep whenever it likes 52 + */ 52 53 synth->catch_up(synth); 53 54 } 54 55
+2 -1
drivers/staging/speakup/varhandlers.c
··· 269 269 /* spk_set_mask_bits sets or clears the punc/delim/repeat bits, 270 270 * if input is null uses the defaults. 271 271 * values for how: 0 clears bits of chars supplied, 272 - * 1 clears allk, 2 sets bits for chars */ 272 + * 1 clears allk, 2 sets bits for chars 273 + */ 273 274 int spk_set_mask_bits(const char *input, const int which, const int how) 274 275 { 275 276 u_char *cp;