android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: pxa27x_keypad - remove an unneeded NULL check

Browse Source 
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>
This commit is contained in:
Dan Carpenter 2015-02-11 09:34:03 -08:00 committed by Dmitry Torokhov
parent 791738be57
commit 2b2f514705
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/keyboard/pxa27x_keypad.c
View File

@ -345,13 +345,11 @@ static int pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
{ {
const struct pxa27x_keypad_platform_data *pdata = keypad->pdata; const struct pxa27x_keypad_platform_data *pdata = keypad->pdata;
struct input_dev *input_dev = keypad->input_dev; struct input_dev *input_dev = keypad->input_dev;
const struct matrix_keymap_data *keymap_data =
pdata ? pdata->matrix_keymap_data : NULL;
unsigned short keycode; unsigned short keycode;
int i; int i;
int error; 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_rows,
pdata->matrix_key_cols, pdata->matrix_key_cols,
keypad->keycodes, input_dev); keypad->keycodes, input_dev);