Merge branch 'torvalds/master'

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

diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c
index 5a8ca35dc9af97898d9fa8f0a7988309edeb57a6..c717e8f3c964bdc26cbd67cccdc81024ad9e0c3b 100644 (file)
--- a/drivers/input/keyboard/lm8333.c
+++ b/drivers/input/keyboard/lm8333.c
@@ -1,6 +1,6 @@
 /*
  * LM8333 keypad driver
- * Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
+ * Copyright (C) 2012 Wolfram Sang, Pengutronix <kernel@pengutronix.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -131,7 +131,8 @@ static irqreturn_t lm8333_irq_thread(int irq, void *data)
 static int lm8333_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
-       const struct lm8333_platform_data *pdata = client->dev.platform_data;
+       const struct lm8333_platform_data *pdata =
+                       dev_get_platdata(&client->dev);
        struct lm8333 *lm8333;
        struct input_dev *input;
        int err, active_time;
@@ -222,7 +223,6 @@ MODULE_DEVICE_TABLE(i2c, lm8333_id);
 static struct i2c_driver lm8333_driver = {
        .driver = {
                .name           = "lm8333",
-               .owner          = THIS_MODULE,
        },
        .probe          = lm8333_probe,
        .remove         = lm8333_remove,
@@ -230,6 +230,6 @@ static struct i2c_driver lm8333_driver = {
 };
 module_i2c_driver(lm8333_driver);
 
-MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");
+MODULE_AUTHOR("Wolfram Sang <kernel@pengutronix.de>");
 MODULE_DESCRIPTION("LM8333 keyboard driver");
 MODULE_LICENSE("GPL v2");