Merge tag 'v4.10-rc5' into next

[mirror_ubuntu-bionic-kernel.git] / drivers / input / keyboard / cros_ec_keyb.c

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 25943e9bc8bff96a3df9417c9e7e85d3fa16cbee..87d071ae21da0e04e86dda1f5baae97fccd19d22 100644 (file)
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -222,7 +222,7 @@ static int cros_ec_keyb_probe(struct platform_device *pdev)
        struct device_node *np;
        int err;
 
-       np = pdev->dev.of_node;
+       np = dev->of_node;
        if (!np)
                return -ENODEV;
 
@@ -248,7 +248,6 @@ static int cros_ec_keyb_probe(struct platform_device *pdev)
        ckdev->ec = ec;
        ckdev->notifier.notifier_call = cros_ec_keyb_work;
        ckdev->dev = dev;
-       dev_set_drvdata(dev, ckdev);
 
        idev->name = CROS_EC_DEV_NAME;
        idev->phys = ec->phys_name;