Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b2f5147 authored by Dan Carpenter's avatar Dan Carpenter Committed by Dmitry Torokhov
Browse files

Input: pxa27x_keypad - remove an unneeded NULL check 



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: default avatarDan Carpenter <dan.carpenter@oracle.com>
[Dmitry: remove the variable altogether given that it is used just once and
 dereference directly.]
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 791738be

drivers/input/keyboard/pxa27x_keypad.c

+1 −3
Original line number Diff line number Diff line
@@ -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);