diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-04 09:08:49 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-07 08:20:16 +0100 |
| commit | 32e573c4795f3164cea8fa8942814726c2f33ed3 (patch) | |
| tree | 39db3592c95f6b4885337072253d61e58cb93eb4 /drivers/input/misc | |
| parent | Input: twl4030-keypad - add device tree support (diff) | |
| download | linux-32e573c4795f3164cea8fa8942814726c2f33ed3.tar.xz linux-32e573c4795f3164cea8fa8942814726c2f33ed3.zip | |
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/misc')
| -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); static int twl6040_vibra_probe(struct platform_device *pdev) { struct device *twl6040_core_dev = pdev->dev.parent; - struct device_node *twl6040_core_node = NULL; + struct device_node *twl6040_core_node; struct vibra_info *info; int vddvibl_uV = 0; int vddvibr_uV = 0; int ret; -#ifdef CONFIG_OF twl6040_core_node = of_find_node_by_name(twl6040_core_dev->of_node, "vibra"); -#endif - if (!twl6040_core_node) { dev_err(&pdev->dev, "parent of node is missing?\n"); return -EINVAL; |