aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/tc3589x-keypad.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-03-27 09:32:06 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-04-03 17:08:59 -0700
commit61125591e1de23992279938eebf8c54f47d7e0a9 (patch)
tree1e911b2a9be8ee9ff932341fad33eb4042136e46 /drivers/input/keyboard/tc3589x-keypad.c
parentInput: tc3589x - localize platform data (diff)
downloadlinux-dev-61125591e1de23992279938eebf8c54f47d7e0a9.tar.xz
linux-dev-61125591e1de23992279938eebf8c54f47d7e0a9.zip
mfd: tc3589x: enforce device-tree only mode
All systems using the TC3589x multifunction expander uses devicetree, so don't clutter the place with a lot of and assume it is there. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard/tc3589x-keypad.c')
-rw-r--r--drivers/input/keyboard/tc3589x-keypad.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c
index ae90df3468e0..31c606a4dd31 100644
--- a/drivers/input/keyboard/tc3589x-keypad.c
+++ b/drivers/input/keyboard/tc3589x-keypad.c
@@ -318,7 +318,6 @@ static void tc3589x_keypad_close(struct input_dev *input)
tc3589x_keypad_disable(keypad);
}
-#ifdef CONFIG_OF
static const struct tc3589x_keypad_platform_data *
tc3589x_keypad_of_probe(struct device *dev)
{
@@ -368,14 +367,6 @@ tc3589x_keypad_of_probe(struct device *dev)
return plat;
}
-#else
-static inline const struct tc3589x_keypad_platform_data *
-tc3589x_keypad_of_probe(struct device *dev)
-{
- return ERR_PTR(-ENODEV);
-}
-#endif
-
static int tc3589x_keypad_probe(struct platform_device *pdev)
{