drivers/input/keyboard: Move a dereference below a NULL test

Commit Message

Julia Lawall Aug. 30, 2009, 9:18 a.m. UTC

From: Julia Lawall <[e-mail]>

If the NULL test is necessary, then the dereference should be moved below
the NULL test.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/).

// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@

- T i = E->fld;
+ T i;
  ... when != E
      when != i
  if (E == NULL) S
+ i = E->fld;
// </smpl>

Signed-off-by: Julia Lawall <[e-mail]>

---
 drivers/input/keyboard/w90p910_keypad.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dmitry Torokhov Aug. 30, 2009, 6:26 p.m. UTC | #1

On Sun, Aug 30, 2009 at 11:18:13AM +0200, Julia Lawall wrote:
> From: Julia Lawall <[e-mail]>
> 
> If the NULL test is necessary, then the dereference should be moved below
> the NULL test.
> 

Applied, thank you Julia.

Patch

diff -u -p a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
--- a/drivers/input/keyboard/w90p910_keypad.c
+++ b/drivers/input/keyboard/w90p910_keypad.c
@@ -120,7 +120,7 @@  static int __devinit w90p910_keypad_prob
 {
 	const struct w90p910_keypad_platform_data *pdata =
 						pdev->dev.platform_data;
-	const struct matrix_keymap_data *keymap_data = pdata->keymap_data;
+	const struct matrix_keymap_data *keymap_data;
 	struct w90p910_keypad *keypad;
 	struct input_dev *input_dev;
 	struct resource *res;
@@ -132,6 +132,7 @@  static int __devinit w90p910_keypad_prob
 		dev_err(&pdev->dev, "no platform data defined\n");
 		return -EINVAL;
 	}
+	keymap_data = pdata->keymap_data;
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {