Keyboard: omap-keypad: use matrix_keypad.h

Most keypad drivers make use of the <linux/input/matrix_keypad.h>
defined macros, structures and inline functions.

Convert omap-keypad driver to use those as well, as suggested by a
compile time warning, hardcoded into the OMAP <palt/keypad.h>.

Created against linux-2.6.37-rc5.
Tested on Amstrad Delta.
Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to
board-h4.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Reviewed-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 17 insertions, 13 deletions

diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index 2afac598baee..d7bbbe721a75 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -64,26 +64,30 @@ omap_palmz71_init_irq(void)
         omap_init_irq();
 }
 
-static int palmz71_keymap[] = {
+static const unsigned int palmz71_keymap[] = {
         KEY(0, 0, KEY_F1),
-        KEY(0, 1, KEY_F2),
-        KEY(0, 2, KEY_F3),
-        KEY(0, 3, KEY_F4),
-        KEY(0, 4, KEY_POWER),
-        KEY(1, 0, KEY_LEFT),
+        KEY(1, 0, KEY_F2),
+        KEY(2, 0, KEY_F3),
+        KEY(3, 0, KEY_F4),
+        KEY(4, 0, KEY_POWER),
+        KEY(0, 1, KEY_LEFT),
         KEY(1, 1, KEY_DOWN),
-        KEY(1, 2, KEY_UP),
-        KEY(1, 3, KEY_RIGHT),
-        KEY(1, 4, KEY_ENTER),
-        KEY(2, 0, KEY_CAMERA),
-        0,
+        KEY(2, 1, KEY_UP),
+        KEY(3, 1, KEY_RIGHT),
+        KEY(4, 1, KEY_ENTER),
+        KEY(0, 2, KEY_CAMERA),
+};
+
+static const struct matrix_keymap_data palmz71_keymap_data = {
+        .keymap         = palmz71_keymap,
+        .keymap_size    = ARRAY_SIZE(palmz71_keymap),
 };
 
 static struct omap_kp_platform_data palmz71_kp_data = {
         .rows   = 8,
         .cols   = 8,
-        .keymap = palmz71_keymap,
-        .rep    = 1,
+        .keymap_data    = &palmz71_keymap_data,
+        .rep    = true,
         .delay  = 80,
 };