Merge branch 'torvalds/master'

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

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index d0d5226d9cd4981398997d60db6b01949bc0030a..7502e46165facb0aeed086277a39f5bd0ec58c10 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -25,7 +25,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/input.h>
@@ -248,7 +247,7 @@ static int omap_kp_probe(struct platform_device *pdev)
 {
        struct omap_kp *omap_kp;
        struct input_dev *input_dev;
-       struct omap_kp_platform_data *pdata =  pdev->dev.platform_data;
+       struct omap_kp_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int i, col_idx, row_idx, ret;
        unsigned int row_shift, keycodemax;
 
@@ -384,7 +383,6 @@ static struct platform_driver omap_kp_driver = {
        .resume         = omap_kp_resume,
        .driver         = {
                .name   = "omap-keypad",
-               .owner  = THIS_MODULE,
        },
 };
 module_platform_driver(omap_kp_driver);