Merge tag 'gpio-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[mirror_ubuntu-bionic-kernel.git] / drivers / input / keyboard / gpio_keys_polled.c

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index b3c8d5e7985c337e53477e30f3ef92e4193cc8e6..edc7262103b9ac982f1dee130723849a5d6a275f 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -252,13 +252,13 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        size = sizeof(struct gpio_keys_polled_dev) +
                        pdata->nbuttons * sizeof(struct gpio_keys_button_data);
-       bdev = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+       bdev = devm_kzalloc(dev, size, GFP_KERNEL);
        if (!bdev) {
                dev_err(dev, "no memory for private data\n");
                return -ENOMEM;
        }
 
-       poll_dev = devm_input_allocate_polled_device(&pdev->dev);
+       poll_dev = devm_input_allocate_polled_device(dev);
        if (!poll_dev) {
                dev_err(dev, "no memory for polled device\n");
                return -ENOMEM;
@@ -326,7 +326,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                        if (button->active_low)
                                flags |= GPIOF_ACTIVE_LOW;
 
-                       error = devm_gpio_request_one(&pdev->dev, button->gpio,
+                       error = devm_gpio_request_one(dev, button->gpio,
                                        flags, button->desc ? : DRV_NAME);
                        if (error) {
                                dev_err(dev,
@@ -359,7 +359,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        bdev->poll_dev = poll_dev;
        bdev->dev = dev;
        bdev->pdata = pdata;
-       platform_set_drvdata(pdev, bdev);
 
        error = input_register_polled_device(poll_dev);
        if (error) {