aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-03-27 12:32:06 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-04-03 20:08:59 -0400
commit61125591e1de23992279938eebf8c54f47d7e0a9 (patch)
tree1e911b2a9be8ee9ff932341fad33eb4042136e46 /drivers/input
parent8b6f53c2f6d3d04c077e74fdb07130242a2d6f58 (diff)
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')
-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)
318 tc3589x_keypad_disable(keypad); 318 tc3589x_keypad_disable(keypad);
319} 319}
320 320
321#ifdef CONFIG_OF
322static const struct tc3589x_keypad_platform_data * 321static const struct tc3589x_keypad_platform_data *
323tc3589x_keypad_of_probe(struct device *dev) 322tc3589x_keypad_of_probe(struct device *dev)
324{ 323{
@@ -368,14 +367,6 @@ tc3589x_keypad_of_probe(struct device *dev)
368 367
369 return plat; 368 return plat;
370} 369}
371#else
372static inline const struct tc3589x_keypad_platform_data *
373tc3589x_keypad_of_probe(struct device *dev)
374{
375 return ERR_PTR(-ENODEV);
376}
377#endif
378
379 370
380static int tc3589x_keypad_probe(struct platform_device *pdev) 371static int tc3589x_keypad_probe(struct platform_device *pdev)
381{ 372{