Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1592270

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

Show all headers | View raw

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

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
 drivers/staging/speakup/selection.c   | 2 +-
 drivers/staging/speakup/varhandlers.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c
index 3d15eec37163..08f68fc2864e 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -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);
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index cc984196020f..5910fe0b1365 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -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];
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] multiple checkpatch issues Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100
  [PATCH 1/6] staging: speakup: Add blank line after function/struct/union/enum declarations Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100
    Re: [PATCH 1/6] staging: speakup: Add blank line after  function/struct/union/enum declarations Greg KH <gregkh@linuxfoundation.org> - 2017-03-09 14:30 +0100
      Re: [PATCH 1/6] staging: speakup: Add blank line after  function/struct/union/enum declarations Greg KH <gregkh@linuxfoundation.org> - 2017-03-09 17:30 +0100
  [PATCH 4/6] staging: speakup: Avoid multiple assignments on same line Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100
  [PATCH 3/6] staging: speakup: Blank lines removed after an open brace '{' Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100
  [PATCH 6/6] staging: speakup: Comparison to NULL could be written Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100
  [PATCH 2/6] staging: speakup: Logical continuations should be on the previous line Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-03-03 21:20 +0100

csiph-web