Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-block.git] / drivers / input / misc / da9063_onkey.c

diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c
index 9d39679372c5ae350b6ace3c65d788f271e3daf2..fd355cf593979ea5eab2f9dca547d9f24d5aced8 100644 (file)
--- a/drivers/input/misc/da9063_onkey.c
+++ b/drivers/input/misc/da9063_onkey.c
@@ -13,7 +13,6 @@
 #include <linux/regmap.h>
 #include <linux/of.h>
 #include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
 #include <linux/mfd/da9063/registers.h>
 #include <linux/mfd/da9062/core.h>
 #include <linux/mfd/da9062/registers.h>
@@ -192,8 +191,6 @@ static void da9063_cancel_poll(void *data)
 
 static int da9063_onkey_probe(struct platform_device *pdev)
 {
-       struct da9063 *da9063 = dev_get_drvdata(pdev->dev.parent);
-       struct da9063_pdata *pdata = dev_get_platdata(da9063->dev);
        struct da9063_onkey *onkey;
        const struct of_device_id *match;
        int irq;
@@ -220,12 +217,8 @@ static int da9063_onkey_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       if (pdata)
-               onkey->key_power = pdata->key_power;
-       else
-               onkey->key_power =
-                       !of_property_read_bool(pdev->dev.of_node,
-                                              "dlg,disable-key-power");
+       onkey->key_power = !of_property_read_bool(pdev->dev.of_node,
+                                                 "dlg,disable-key-power");
 
        onkey->input = devm_input_allocate_device(&pdev->dev);
        if (!onkey->input) {