Input: twl6040-vibra - remove unneeded check for CONFIG_OF
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 4 Jan 2014 08:08:49 +0000 (00:08 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Jan 2014 07:20:16 +0000 (23:20 -0800)
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>
drivers/input/misc/twl6040-vibra.c

index 89bca7647f549ca033d297c8de994df0bcabe307..77dc23b94eb1eaad2232d8671024dc1ff4af359a 100644 (file)
@@ -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;