Skip to contentSkip to conversation

multiple checkpatch issues

PATCH In review Arushi Singhal 2 participants 9 messages Mar 3, 2017 – Mar 9, 2017 1 message not in the archive Staging

lore
Share & tools
lore
#0 lore raw

cover multiple checkpatch issues

Improve readability by fixing multiple checkpatch.pl issues in speakup driver.

Arushi Singhal (6):
staging: speakup: Add blank line after function/struct/union/enum
declarations
staging: speakup: Logical continuations should be on the previous line
staging: speakup: Blank lines removed after an open brace '{'
staging: speakup: Avoid multiple assignments on same line
staging: speakup: fixes braces {} should be used on all arms of this
statement
staging: speakup: Comparison to NULL could be written

 drivers/staging/speakup/kobjects.c     |  1 -
 drivers/staging/speakup/main.c         | 85 ++++++++++++++++++++--------------
 drivers/staging/speakup/selection.c    |  2 +-
 drivers/staging/speakup/serialio.c     |  1 +
 drivers/staging/speakup/speakup_dtlk.c |  1 +
 drivers/staging/speakup/varhandlers.c  |  6 +--
 6 files changed, 55 insertions(+), 41 deletions(-)
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/6 staging: speakup: Add blank line after function/struct/union/enum declarations

This patch fixes the warnings reported by checkpatch.pl for please use a blank line after function/struct/union/enum declarations.

---
 drivers/staging/speakup/main.c         | 1 +
 drivers/staging/speakup/serialio.c     | 1 +
 drivers/staging/speakup/speakup_dtlk.c | 1 +
 3 files changed, 3 insertions(+)
drivers/staging/speakup/main.c +1 -0
index 01eabc19039c..17df20ec94be 100644
@@ -108,6 +108,7 @@ enum {
 	CT_Window,
 	CT_Max
 };
+
 #define read_all_mode CT_Max
 
 static struct tty_struct *tty;
drivers/staging/speakup/serialio.c +1 -0
index 7e6bc3b05da3..9b2626e85042 100644
@@ -21,6 +21,7 @@ static void start_serial_interrupt(int irq);
 static const struct old_serial_port rs_table[] = {
 	SERIAL_PORT_DFNS
 };
+
 static const struct old_serial_port *serstate;
 static int timeouts;
 
drivers/staging/speakup/speakup_dtlk.c +1 -0
index 1ebe5012ec0b..e36360f65f36 100644
@@ -43,6 +43,7 @@ static int port_forced;
 static unsigned int synth_portlist[] = {
 		 0x25e, 0x29e, 0x2de, 0x31e, 0x35e, 0x39e, 0
 };
+
 static u_char synth_status;
 
 static struct var_t vars[] = {
Signature · 1 line
2.11.0
maintainer
#2 lore raw

Re: [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations

Quoted 10 lines · Arushi Singhal

This patch fixes the warnings reported by checkpatch.pl for please use a blank line after function/struct/union/enum declarations.

---
 drivers/staging/speakup/main.c         | 1 +
 drivers/staging/speakup/serialio.c     | 1 +
 drivers/staging/speakup/speakup_dtlk.c | 1 +
 3 files changed, 3 insertions(+)

You seem to have sent me many different series of patches for this driver, some of them the same, some different, some duplicates. I have no idea what to apply and what not to apply, so I'm dropping them all from my patch queue. Please fix up and resend a _single_ patch series with your patches so I know what to review and possibly apply.

thanks,

greg k-h

A message that is not in the archive (sent off-list or not yet received): CA+XqjF_S9X5SmFo=AdSbPR8JnQvZzEye-xSnneF5eCm-6_G86Q@mail.gmail.com

maintainer
#4 lore raw

Re: [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations

Quoted 22 lines · Arushi Singhal

On Thu, Mar 9, 2017 at 6:55 PM, Greg KH <[email protected]> wrote:

On Sat, Mar 04, 2017 at 01:47:04AM +0530, Arushi Singhal wrote:
> This patch fixes the warnings reported by checkpatch.pl > for please use a blank line after function/struct/union/enum > declarations.
>
> Signed-off-by: Arushi Singhal <[email protected]> > ---
>� drivers/staging/speakup/main.c� � � � �| 1 + >� drivers/staging/speakup/serialio.c� � �| 1 + >� drivers/staging/speakup/speakup_dtlk.c | 1 +
>� 3 files changed, 3 insertions(+)

You seem to have sent me many different series of patches for this driver, some of them the same, some different, some duplicates.� I have no idea what to apply and what not to apply, so I'm dropping them all from my patch queue.� Please fix up and resend a _single_ patch series with your patches so I know what to review and possibly apply.

Quoted 5 lines

Hi Greg
I think the patch series linked below is not confusing and can be applied.

https://groups.google.com/forum/#!searchin/outreachy-kernel/arushi|
sort:relevance/outreachy-kernel/9W_8BejvjwU/reEewnffAwAJ

It's not in my queue at all, all speakup patches are now flushed out, so if I have not applied it, please resend.

thanks,

greg k-h

#5 lore raw

PATCH 2/6 staging: speakup: Logical continuations should be on the previous line

In reply to Arushi Singhal

This patch fixes the checkpatch issue:
CHECK: Logical continuations should be on the previous line.

---
 drivers/staging/speakup/main.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/staging/speakup/main.c +17 -17
index 17df20ec94be..c1c3ee7dc95a 100644
@@ -564,18 +564,18 @@ static u_long get_word(struct vc_data *vc)
 		*buf = '\0';
 		synth_printf("%s\n", spk_msg_get(MSG_SPACE));
 		return 0;
-	} else if ((tmpx < vc->vc_cols - 2)
-		   && (ch == SPACE || ch == 0 || IS_WDLM(ch))
-		   && ((char)get_char(vc, (u_short *)&tmp_pos + 1, &temp) >
-		       SPACE)) {
+	} else if ((tmpx < vc->vc_cols - 2) &&
+		   (ch == SPACE || ch == 0 || IS_WDLM(ch)) &&
+		   ((char)get_char(vc, (u_short *)&tmp_pos + 1, &temp) >
+		    SPACE)) {
 		tmp_pos += 2;
 		tmpx++;
 	} else
 		while (tmpx > 0) {
 			ch = (char)get_char(vc, (u_short *)tmp_pos - 1, &temp);
-			if ((ch == SPACE || ch == 0 || IS_WDLM(ch))
-			    && ((char)get_char(vc, (u_short *)tmp_pos, &temp) >
-				SPACE))
+			if ((ch == SPACE || ch == 0 || IS_WDLM(ch)) &&
+			    ((char)get_char(vc, (u_short *)tmp_pos, &temp) >
+			     SPACE))
 				break;
 			tmp_pos -= 2;
 			tmpx--;
@@ -586,8 +586,8 @@ static u_long get_word(struct vc_data *vc)
 		tmp_pos += 2;
 		tmpx++;
 		ch = (char)get_char(vc, (u_short *)tmp_pos, &temp);
-		if ((ch == SPACE) || ch == 0
-		    || (IS_WDLM(buf[cnt - 1]) && (ch > SPACE)))
+		if ((ch == SPACE) || ch == 0 ||
+		    (IS_WDLM(buf[cnt - 1]) && (ch > SPACE)))
 			break;
 		buf[cnt++] = ch;
 	}
@@ -725,8 +725,8 @@ static void spell_word(struct vc_data *vc)
 			synth_printf("%s", str_cap);
 			last_cap = str_cap;
 		}
-		if (this_speakup_key == SPELL_PHONETIC
-		    && (isascii(ch) && isalpha(ch))) {
+		if (this_speakup_key == SPELL_PHONETIC &&
+		    (isascii(ch) && isalpha(ch))) {
 			ch &= 31;
 			cp1 = phonetic[--ch];
 		} else {
@@ -895,8 +895,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
 	while (start < end) {
 		sentbuf[bn][i] = (char)get_char(vc, (u_short *)start, &tmp);
 		if (i > 0) {
-			if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.'
-			    && numsentences[bn] < 9) {
+			if (sentbuf[bn][i] == SPACE && sentbuf[bn][i - 1] == '.' &&
+			    numsentences[bn] < 9) {
 				/* Sentence Marker */
 				numsentences[bn]++;
 				sentmarks[bn][numsentences[bn]] =
@@ -1280,8 +1280,8 @@ void spk_reset_default_chars(void)
 
 	/* First, free any non-default */
 	for (i = 0; i < 256; i++) {
-		if (spk_characters[i]
-		    && (spk_characters[i] != spk_default_chars[i]))
+		if (spk_characters[i] &&
+		    (spk_characters[i] != spk_default_chars[i]))
 			kfree(spk_characters[i]);
 	}
 
@@ -2073,8 +2073,8 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
 	tty = vc->port.tty;
 	if (type >= 0xf0)
 		type -= 0xf0;
-	if (type == KT_PAD
-		&& (vt_get_leds(fg_console, VC_NUMLOCK))) {
+	if (type == KT_PAD &&
+	    (vt_get_leds(fg_console, VC_NUMLOCK))) {
 		if (up_flag) {
 			spk_keydown = 0;
 			goto out;
Signature · 1 line
2.11.0
#6 lore raw

PATCH 3/6 staging: speakup: Blank lines removed after an open brace '{'

In reply to Arushi Singhal

Blank lines aren't necessary after an open brace '{' as reported by Checkpatch.pl.

---
 drivers/staging/speakup/kobjects.c | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/speakup/kobjects.c +0 -1
index edde9e68779e..441f14f07382 100644
@@ -761,7 +761,6 @@ static ssize_t message_store_helper(const char *buf, size_t count,
 	enum msg_index_t curmessage;
 
 	while (cp < end) {
-
 		while ((cp < end) && (*cp == ' ' || *cp == '\t'))
 			cp++;
 
Signature · 1 line
2.11.0
#7 lore raw

PATCH 4/6 staging: speakup: Avoid multiple assignments on same line

In reply to Arushi Singhal

This patch fixes the checkpatch.pl warning "multiple assignments should be avoided."

---
 drivers/staging/speakup/main.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/speakup/main.c +12 -6
index c1c3ee7dc95a..6c21ae1ae2d3 100644
@@ -269,9 +269,12 @@ static unsigned char get_attributes(struct vc_data *vc, u16 *pos)
 
 static void speakup_date(struct vc_data *vc)
 {
-	spk_x = spk_cx = vc->vc_x;
-	spk_y = spk_cy = vc->vc_y;
-	spk_pos = spk_cp = vc->vc_pos;
+	spk_x = vc->vc_x;
+	spk_cx = spk_x;
+	spk_y = vc->vc_y;
+	spk_cy = spk_y;
+	spk_pos = vc->vc_pos;
+	spk_cp = spk_pos;
 	spk_old_attr = spk_attr;
 	spk_attr = get_attributes(vc, (u_short *)spk_pos);
 }
@@ -1643,9 +1646,12 @@ static int speak_highlight(struct vc_data *vc)
 		spk_do_flush();
 		spkup_write(speakup_console[vc_num]->ht.highbuf[hc],
 			    speakup_console[vc_num]->ht.highsize[hc]);
-		spk_pos = spk_cp = speakup_console[vc_num]->ht.rpos[hc];
-		spk_x = spk_cx = speakup_console[vc_num]->ht.rx[hc];
-		spk_y = spk_cy = speakup_console[vc_num]->ht.ry[hc];
+		spk_pos = speakup_console[vc_num]->ht.rpos[hc];
+		spk_cp = speakup_console[vc_num]->ht.rpos[hc];
+		spk_x = speakup_console[vc_num]->ht.rx[hc];
+		spk_cx = speakup_console[vc_num]->ht.rx[hc];
+		spk_y = speakup_console[vc_num]->ht.ry[hc];
+		spk_cy = speakup_console[vc_num]->ht.ry[hc];
 		return 1;
 	}
 	return 0;
Signature · 1 line
2.11.0
#8 lore raw

PATCH 5/6 staging: speakup: fixes braces {} should be used on all arms of this statement

In reply to Arushi Singhal

This patch fixes the checks reported by checkpatch.pl for braces {} should be used on all arms of this statement.

---
 drivers/staging/speakup/main.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)
drivers/staging/speakup/main.c +19 -13
index 6c21ae1ae2d3..a3daf4ae5c0a 100644
@@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
 				break;
 			spk_y--;
 			spk_x = vc->vc_cols - 1;
-		} else
+		} else {
 			spk_x--;
+		}
 		spk_pos -= 2;
 		ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
 		if (ch == SPACE || ch == 0)
@@ -694,8 +695,9 @@ static void say_next_word(struct vc_data *vc)
 			spk_y++;
 			spk_x = 0;
 			edge_said = edge_right;
-		} else
+		} else {
 			spk_x++;
+		}
 		spk_pos += 2;
 		last_state = state;
 	}
@@ -722,8 +724,9 @@ static void spell_word(struct vc_data *vc)
 				spk_pitch_shift++;
 			else	/* synth has no pitch */
 				last_cap = spk_str_caps_stop;
-		} else
+		} else {
 			str_cap = spk_str_caps_stop;
+		}
 		if (str_cap != last_cap) {
 			synth_printf("%s", str_cap);
 			last_cap = str_cap;
@@ -1331,8 +1334,9 @@ static int speakup_allocate(struct vc_data *vc)
 		if (!speakup_console[vc_num])
 			return -ENOMEM;
 		speakup_date(vc);
-	} else if (!spk_parked)
+	} else if (!spk_parked) {
 		speakup_date(vc);
+	}
 
 	return 0;
 }
@@ -1385,9 +1389,9 @@ static void read_all_doc(struct vc_data *vc)
 		prev_cursor_track = cursor_track;
 	cursor_track = read_all_mode;
 	spk_reset_index_count(0);
-	if (get_sentence_buf(vc, 0) == -1)
+	if (get_sentence_buf(vc, 0) == -1) {
 		kbd_fakekey2(vc, RA_DOWN_ARROW);
-	else {
+	} else {
 		say_sentence_num(0, 0);
 		synth_insert_next_index(0);
 		start_read_all_timer(vc, RA_TIMER);
@@ -1434,8 +1438,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
 			if (!say_sentence_num(sentcount + 1, 1)) {
 				sn = 1;
 				spk_reset_index_count(sn);
-			} else
+			} else {
 				synth_insert_next_index(0);
+			}
 			if (!say_sentence_num(sn, 0)) {
 				kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
 				return;
@@ -1464,9 +1469,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
 		rv = get_sentence_buf(vc, 0);
 		if (rv == -1)
 			read_all_doc(vc);
-		if (rv == 0)
+		if (rv == 0) {
 			kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
-		else {
+		} else {
 			say_sentence_num(1, 0);
 			synth_insert_next_index(0);
 			start_read_all_timer(vc, RA_TIMER);
@@ -2162,10 +2167,11 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
 		if (type == KT_SPEC && value == 1) {
 			value = '\n';
 			type = KT_LATIN;
-		} else if (type == KT_LETTER)
+		} else if (type == KT_LETTER) {
 			type = KT_LATIN;
-		else if (value == 0x7f)
+		} else if (value == 0x7f) {
 			value = 8;	/* make del = backspace */
+		}
 		ret = (*spk_special_handler) (vc, type, value, keycode);
 		spk_close_press = 0;
 		if (ret < 0)
@@ -2259,9 +2265,9 @@ static int vt_notifier_call(struct notifier_block *nb,
 		speakup_deallocate(vc);
 		break;
 	case VT_WRITE:
-		if (param->c == '\b')
+		if (param->c == '\b') {
 			speakup_bs(vc);
-		else if (param->c < 0x100) {
+		} else if (param->c < 0x100) {
 			char d = param->c;
 
 			speakup_con_write(vc, &d, 1);
Signature · 1 line
2.11.0
#9 lore raw

PATCH 6/6 staging: speakup: Comparison to NULL could be written

In reply to Arushi Singhal

Fixed coding style for null comparisons in speakup driver to be more consistant with the rest of the kernel coding style.

---
 drivers/staging/speakup/selection.c   | 2 +-
 drivers/staging/speakup/varhandlers.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/speakup/selection.c +1 -1
index 3d15eec37163..08f68fc2864e 100644
@@ -175,7 +175,7 @@ static struct speakup_paste_work speakup_paste_work = {
 
 int speakup_paste_selection(struct tty_struct *tty)
 {
-	if (cmpxchg(&speakup_paste_work.tty, NULL, tty) != NULL)
+	if (cmpxchg(&speakup_paste_work.tty, NULL, tty))
 		return -EBUSY;
 
 	tty_kref_get(tty);
drivers/staging/speakup/varhandlers.c +3 -3
index cc984196020f..5910fe0b1365 100644
@@ -98,7 +98,7 @@ void speakup_register_var(struct var_t *var)
 		}
 	}
 	p_header = var_ptrs[var->var_id];
-	if (p_header->data != NULL)
+	if (p_header->data)
 		return;
 	p_header->data = var;
 	switch (p_header->var_type) {
@@ -210,11 +210,11 @@ int spk_set_num_var(int input, struct st_var_header *var, int how)
 		return -ERANGE;
 
 	var_data->u.n.value = val;
-	if (var->var_type == VAR_TIME && p_val != NULL) {
+	if (var->var_type == VAR_TIME && p_val) {
 		*p_val = msecs_to_jiffies(val);
 		return 0;
 	}
-	if (p_val != NULL)
+	if (p_val)
 		*p_val = val;
 	if (var->var_id == PUNC_LEVEL) {
 		spk_punc_mask = spk_punc_masks[val];
Signature · 1 line
2.11.0