diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-04 03:08:49 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-07 02:20:16 -0500 |
commit | 32e573c4795f3164cea8fa8942814726c2f33ed3 (patch) | |
tree | 39db3592c95f6b4885337072253d61e58cb93eb4 /drivers/input | |
parent | 7abf38d6d13c9e3e3b9e4d7d8d7a68a353279d11 (diff) |
Input: twl6040-vibra - remove unneeded check for CONFIG_OF
Since the driver requires DT now we do not need to check if CONFIG_OF is
defined.
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/misc/twl6040-vibra.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c index 89bca7647f54..77dc23b94eb1 100644 --- a/drivers/input/misc/twl6040-vibra.c +++ b/drivers/input/misc/twl6040-vibra.c | |||
@@ -258,17 +258,14 @@ static SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops, twl6040_vibra_suspend, NULL); | |||
258 | static int twl6040_vibra_probe(struct platform_device *pdev) | 258 | static int twl6040_vibra_probe(struct platform_device *pdev) |
259 | { | 259 | { |
260 | struct device *twl6040_core_dev = pdev->dev.parent; | 260 | struct device *twl6040_core_dev = pdev->dev.parent; |
261 | struct device_node *twl6040_core_node = NULL; | 261 | struct device_node *twl6040_core_node; |
262 | struct vibra_info *info; | 262 | struct vibra_info *info; |
263 | int vddvibl_uV = 0; | 263 | int vddvibl_uV = 0; |
264 | int vddvibr_uV = 0; | 264 | int vddvibr_uV = 0; |
265 | int ret; | 265 | int ret; |
266 | 266 | ||
267 | #ifdef CONFIG_OF | ||
268 | twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node, | 267 | twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node, |
269 | "vibra"); | 268 | "vibra"); |
270 | #endif | ||
271 | |||
272 | if (!twl6040_core_node) { | 269 | if (!twl6040_core_node) { |
273 | dev_err(&pdev->dev, "parent of node is missing?\n"); | 270 | dev_err(&pdev->dev, "parent of node is missing?\n"); |
274 | return -EINVAL; | 271 | return -EINVAL; |