[PATCH] fixup! Input: of_keymap: Introduce matrix_keypad_of_build_keymap()
From: Viresh Kumar <hidden>
Date: 2012-04-02 04:01:51
Also in:
linux-devicetree
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, tegra kbc driver, the rest · Maintainers:
Dmitry Torokhov, Laxman Dewangan, Linus Torvalds
Hi Dmitry, This is an incremental patch over patch "Input: of_keymap: Introduce matrix_keypad_of_build_keymap()" sent earlier by me. Please squash it to that patch while applying. This contains last few changes suggested by Stephen on V4 of this patch. --- drivers/input/keyboard/tegra-kbc.c | 4 ++-- include/linux/input/matrix_keypad.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index d1cc006..6300cc7 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c@@ -619,8 +619,8 @@ tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata, } #ifdef CONFIG_OF -static struct tegra_kbc_platform_data * __devinit -tegra_kbc_dt_parse_pdata(struct device_node *np) +static inline struct tegra_kbc_platform_data * tegra_kbc_dt_parse_pdata( + struct device_node *np) { struct tegra_kbc_platform_data *pdata; u32 prop;
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index 341aca1..02b2118 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h@@ -111,7 +111,7 @@ matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data, int matrix_keypad_of_build_keymap(struct input_dev *idev, unsigned int row_shift, const char *propname); #else -int matrix_keypad_of_build_keymap(struct input_dev *idev, +static inline int matrix_keypad_of_build_keymap(struct input_dev *idev, unsigned int row_shift, const char *propname) { return NULL;
--
1.7.9