staging: speakup: Fix warning reported by checkpatch (13d825ed) · Commits · 戴 / test

drivers/staging/speakup/buffers.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,8 @@ void synth_buffer_add(char ch)
		{
		if (!synth->alive) {
		/* This makes sure that we won't stop TTYs if there is no synth
		* to restart them */
		* to restart them
		*/
		return;
		}
		if (synth_buffer_free() <= 100) {

drivers/staging/speakup/i18n.c

+2 −1

Original line number	Diff line number	Diff line
		/* Internationalization implementation. Includes definitions of English
		* string arrays, and the i18n pointer. */
		* string arrays, and the i18n pointer.
		*/

		#include <linux/slab.h> /* For kmalloc. */
		#include <linux/ctype.h>

drivers/staging/speakup/kobjects.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,8 @@ static ssize_t keymap_show(struct kobject kobj, struct kobj_attribute attr,
		cp += sprintf(cp, "%d, %d, %d,\n", KEY_MAP_VER, num_keys, nstates);
		cp1 += 2; /* now pointing at shift states */
		/* dump num_keys+1 as first row is shift states + flags,
		* each subsequent row is key + states */
		* each subsequent row is key + states
		*/
		for (n = 0; n <= num_keys; n++) {
		for (i = 0; i <= nstates; i++) {
		ch = *cp1++;

drivers/staging/speakup/main.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -128,7 +128,8 @@ static char *phonetic[] = {

		/* array of 256 char pointers (one for each character description)
		* initialized to default_chars and user selectable via
		* /proc/speakup/characters */
		* /proc/speakup/characters
		*/
		char *spk_characters[256];

		char *spk_default_chars[256] = {
		@@ -194,7 +195,8 @@ char *spk_default_chars[256] = {

		/* array of 256 u_short (one for each character)
		* initialized to default_chartab and user selectable via
		* /sys/module/speakup/parameters/chartab */
		* /sys/module/speakup/parameters/chartab
		*/
		u_short spk_chartab[256];

		static u_short default_chartab[256] = {
		@@ -540,7 +542,8 @@ static void say_next_char(struct vc_data *vc)
		* see if there is a word starting on the next position to the right
		* and return that word if it exists. If it does not exist it will
		* move left to the beginning of any previous word on the line or the
		* beginning off the line whichever comes first.. */
		* beginning off the line whichever comes first..
		*/

		static u_long get_word(struct vc_data *vc)
		{
		@@ -1113,7 +1116,8 @@ static void spkup_write(const char *in_buf, int count)
		* suppress multiple to get rid of long pauses and
		* clear repeat count
		* so if someone has
		* repeats on you don't get nothing repeated count */
		* repeats on you don't get nothing repeated count
		*/
		if (ch != old_ch)
		synth_printf("%c", ch);
		else
		@@ -1509,7 +1513,8 @@ static void do_handle_cursor(struct vc_data *vc, u_char value, char up_flag)
		if (spk_no_intr)
		spk_do_flush();
		/* the key press flushes if !no_inter but we want to flush on cursor
		* moves regardless of no_inter state */
		* moves regardless of no_inter state
		*/
		is_cursor = value + 1;
		old_cursor_pos = vc->vc_pos;
		old_cursor_x = vc->vc_x;

drivers/staging/speakup/selection.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,8 @@ int speakup_set_selection(struct tty_struct *tty)
		obp = bp;
		if (!((i + 2) % vc->vc_size_row)) {
		/* strip trailing blanks from line and add newline,
		unless non-space at end of line. */
		* unless non-space at end of line.
		*/
		if (obp != bp) {
		bp = obp;
		*bp++ = '\r';

Admin message