Input: ep93xx_keypad - cleanup and use matrix_keypad helpers

Use struct matrix_keymap_data to supply the keymap from the platform code
and matrix_keypad_build_keymap() to initialize the keymap.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
index 62d17421e48c..1e2f4e97f428 100644
--- a/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
@@ -5,6 +5,8 @@
 #ifndef __ASM_ARCH_EP93XX_KEYPAD_H
 #define __ASM_ARCH_EP93XX_KEYPAD_H
 
+struct matrix_keymap_data;
+
 /* flags for the ep93xx_keypad driver */
 #define EP93XX_KEYPAD_DISABLE_3_KEY     (1<<0)  /* disable 3-key reset */
 #define EP93XX_KEYPAD_DIAG_MODE         (1<<1)  /* diagnostic mode */
@@ -15,15 +17,13 @@
 
 /**
  * struct ep93xx_keypad_platform_data - platform specific device structure
- * @matrix_key_map:             array of keycodes defining the keypad matrix
- * @matrix_key_map_size:        ARRAY_SIZE(matrix_key_map)
- * @debounce:                   debounce start count; terminal count is 0xff
- * @prescale:                   row/column counter pre-scaler load value
- * @flags:                      see above
+ * @keymap_data:        pointer to &matrix_keymap_data
+ * @debounce:           debounce start count; terminal count is 0xff
+ * @prescale:           row/column counter pre-scaler load value
+ * @flags:              see above
  */
 struct ep93xx_keypad_platform_data {
-        unsigned int    *matrix_key_map;
-        int             matrix_key_map_size;
+        struct matrix_keymap_data *keymap_data;
         unsigned int    debounce;
         unsigned int    prescale;
         unsigned int    flags;