OSDN Git Service

staging: speakup: Simplify "NULL" comparisons
authorArushi Singhal <arushisinghal19971997@gmail.com>
Tue, 21 Mar 2017 11:42:27 +0000 (17:12 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Mar 2017 13:20:41 +0000 (14:20 +0100)
Fixed coding style for null comparisons in speakup driver to be more
consistant with the rest of the kernel coding style.
Replaced 'x != NULL' with 'x' and 'x = NULL' with '!x'.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/selection.c
drivers/staging/speakup/varhandlers.c

index afd9a44..4417c00 100644 (file)
@@ -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);
index cc98419..5910fe0 100644 (file)
@@ -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];