Input: pxa27x_keypad - remove an unneeded NULL check
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 11 Feb 2015 17:34:03 +0000 (09:34 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 12 Feb 2015 07:07:12 +0000 (23:07 -0800)
Static checkers complain about this NULL check because we dereference it
without checking a couple lines later.  This function is only called
when "keypad->pdata" is non-NULL so we can just delete the NULL test.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[Dmitry: remove the variable altogether given that it is used just once and
 dereference directly.]
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/pxa27x_keypad.c

index a89488aa1aa4d0ea0fefcd796646f04dbe851c22..fcef5d1365e2a3034e3a9544f7e403a0680a5058 100644 (file)
@@ -345,13 +345,11 @@ static int pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
 {
        const struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
        struct input_dev *input_dev = keypad->input_dev;
-       const struct matrix_keymap_data *keymap_data =
-                               pdata ? pdata->matrix_keymap_data : NULL;
        unsigned short keycode;
        int i;
        int error;
 
-       error = matrix_keypad_build_keymap(keymap_data, NULL,
+       error = matrix_keypad_build_keymap(pdata->matrix_keymap_data, NULL,
                                           pdata->matrix_key_rows,
                                           pdata->matrix_key_cols,
                                           keypad->keycodes, input_dev);