Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[mirror_ubuntu-bionic-kernel.git] / drivers / input / misc / e3x0-button.c

diff --git a/drivers/input/misc/e3x0-button.c b/drivers/input/misc/e3x0-button.c
index 13bfca8a7b166b75c4ecd0e19b3ac9c3892231d4..e956cf1d273fe6dd65775b6b18356c73e4531a49 100644 (file)
--- a/drivers/input/misc/e3x0-button.c
+++ b/drivers/input/misc/e3x0-button.c
@@ -120,17 +120,10 @@ static int e3x0_button_probe(struct platform_device *pdev)
                return error;
        }
 
-       platform_set_drvdata(pdev, input);
        device_init_wakeup(&pdev->dev, 1);
        return 0;
 }
 
-static int e3x0_button_remove(struct platform_device *pdev)
-{
-       device_init_wakeup(&pdev->dev, 0);
-       return 0;
-}
-
 #ifdef CONFIG_OF
 static const struct of_device_id e3x0_button_match[] = {
        { .compatible = "ettus,e3x0-button", },
@@ -146,7 +139,6 @@ static struct platform_driver e3x0_button_driver = {
                .pm     = &e3x0_button_pm_ops,
        },
        .probe          = e3x0_button_probe,
-       .remove         = e3x0_button_remove,
 };
 
 module_platform_driver(e3x0_button_driver);