Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / input / misc / hisi_powerkey.c

diff --git a/drivers/input/misc/hisi_powerkey.c b/drivers/input/misc/hisi_powerkey.c
index 675539c529ce75e06b2a70325347044ea7799eb3..dee6245f38d777b30cdb323f895a8e7be0bf8398 100644 (file)
--- a/drivers/input/misc/hisi_powerkey.c
+++ b/drivers/input/misc/hisi_powerkey.c
@@ -75,9 +75,9 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev)
        struct input_dev *input;
        int irq, i, error;
 
-       input = devm_input_allocate_device(&pdev->dev);
+       input = devm_input_allocate_device(dev);
        if (!input) {
-               dev_err(&pdev->dev, "failed to allocate input device\n");
+               dev_err(dev, "failed to allocate input device\n");
                return -ENOMEM;
        }
 
@@ -111,19 +111,11 @@ static int hi65xx_powerkey_probe(struct platform_device *pdev)
 
        error = input_register_device(input);
        if (error) {
-               dev_err(&pdev->dev, "failed to register input device: %d\n",
-                       error);
+               dev_err(dev, "failed to register input device: %d\n", error);
                return error;
        }
 
-       device_init_wakeup(&pdev->dev, 1);
-
-       return 0;
-}
-
-static int hi65xx_powerkey_remove(struct platform_device *pdev)
-{
-       device_init_wakeup(&pdev->dev, 0);
+       device_init_wakeup(dev, 1);
 
        return 0;
 }
@@ -133,7 +125,6 @@ static struct platform_driver hi65xx_powerkey_driver = {
                .name = "hi65xx-powerkey",
        },
        .probe = hi65xx_powerkey_probe,
-       .remove  = hi65xx_powerkey_remove,
 };
 module_platform_driver(hi65xx_powerkey_driver);