Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / pxa930_rotary.c

diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c
index bcad95be73aaea053eef65168a9cdcea28a350db..1cf5211fddaa23617159c951e09351ae7ae0e31d 100644 (file)
--- a/drivers/input/keyboard/pxa930_rotary.c
+++ b/drivers/input/keyboard/pxa930_rotary.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
@@ -84,7 +83,8 @@ static void pxa930_rotary_close(struct input_dev *dev)
 
 static int pxa930_rotary_probe(struct platform_device *pdev)
 {
-       struct pxa930_rotary_platform_data *pdata = pdev->dev.platform_data;
+       struct pxa930_rotary_platform_data *pdata =
+                       dev_get_platdata(&pdev->dev);
        struct pxa930_rotary *r;
        struct input_dev *input_dev;
        struct resource *res;
@@ -181,7 +181,6 @@ static int pxa930_rotary_remove(struct platform_device *pdev)
        free_irq(platform_get_irq(pdev, 0), r);
        input_unregister_device(r->input_dev);
        iounmap(r->mmio_base);
-       platform_set_drvdata(pdev, NULL);
        kfree(r);
 
        return 0;
@@ -190,7 +189,6 @@ static int pxa930_rotary_remove(struct platform_device *pdev)
 static struct platform_driver pxa930_rotary_driver = {
        .driver         = {
                .name   = "pxa930-rotary",
-               .owner  = THIS_MODULE,
        },
        .probe          = pxa930_rotary_probe,
        .remove         = pxa930_rotary_remove,