Input: gpio_keys_polled - switch to using polled mode of input devices

We have added polled mode to the normal input devices with the intent of
retiring input_polled_dev. This converts gpio_keys_polled driver to use
the polling mode of standard input devices and removes dependency on
INPUT_POLLDEV.

Note that we still keep polled and non-polled gpio-keys drivers separate,
as they are different enough and mixing them up would make the code pretty
confusing.

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/20191017204217.106453-9-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 84daf99c475ba57935e17207f9094c45e8bafa2a..1ddfc24130355a0a8857b010d6c5ea1c183c1fea 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -248,7 +248,6 @@ config KEYBOARD_GPIO
 config KEYBOARD_GPIO_POLLED
        tristate "Polled GPIO buttons"
        depends on GPIOLIB
-       select INPUT_POLLDEV
        help
          This driver implements support for buttons connected
          to GPIO pins that are not capable of generating interrupts.

diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 51bbd010089abe97eb88422d0df85cd13f296934..6eb0a2f3f9de7954c33a89477537fd5b7281ce85 100644 (file)
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/input.h>
-#include <linux/input-polldev.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
@@ -34,7 +33,7 @@ struct gpio_keys_button_data {
 };
 
 struct gpio_keys_polled_dev {
-       struct input_polled_dev *poll_dev;
+       struct input_dev *input;
        struct device *dev;
        const struct gpio_keys_platform_data *pdata;
        unsigned long rel_axis_seen[BITS_TO_LONGS(REL_CNT)];
@@ -42,12 +41,11 @@ struct gpio_keys_polled_dev {
        struct gpio_keys_button_data data[0];
 };
 
-static void gpio_keys_button_event(struct input_polled_dev *dev,
+static void gpio_keys_button_event(struct input_dev *input,
                                   const struct gpio_keys_button *button,
                                   int state)
 {
-       struct gpio_keys_polled_dev *bdev = dev->private;
-       struct input_dev *input = dev->input;
+       struct gpio_keys_polled_dev *bdev = input_get_drvdata(input);
        unsigned int type = button->type ?: EV_KEY;
 
        if (type == EV_REL) {
@@ -66,7 +64,7 @@ static void gpio_keys_button_event(struct input_polled_dev *dev,
        }
 }
 
-static void gpio_keys_polled_check_state(struct input_polled_dev *dev,
+static void gpio_keys_polled_check_state(struct input_dev *input,
                                         const struct gpio_keys_button *button,
                                         struct gpio_keys_button_data *bdata)
 {
@@ -74,10 +72,10 @@ static void gpio_keys_polled_check_state(struct input_polled_dev *dev,
 
        state = gpiod_get_value_cansleep(bdata->gpiod);
        if (state < 0) {
-               dev_err(dev->input->dev.parent,
+               dev_err(input->dev.parent,
                        "failed to get gpio state: %d\n", state);
        } else {
-               gpio_keys_button_event(dev, button, state);
+               gpio_keys_button_event(input, button, state);
 
                if (state != bdata->last_state) {
                        bdata->count = 0;
@@ -86,11 +84,10 @@ static void gpio_keys_polled_check_state(struct input_polled_dev *dev,
        }
 }
 
-static void gpio_keys_polled_poll(struct input_polled_dev *dev)
+static void gpio_keys_polled_poll(struct input_dev *input)
 {
-       struct gpio_keys_polled_dev *bdev = dev->private;
+       struct gpio_keys_polled_dev *bdev = input_get_drvdata(input);
        const struct gpio_keys_platform_data *pdata = bdev->pdata;
-       struct input_dev *input = dev->input;
        int i;
 
        memset(bdev->rel_axis_seen, 0, sizeof(bdev->rel_axis_seen));
@@ -101,10 +98,10 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
 
                if (bdata->count < bdata->threshold) {
                        bdata->count++;
-                       gpio_keys_button_event(dev, &pdata->buttons[i],
+                       gpio_keys_button_event(input, &pdata->buttons[i],
                                               bdata->last_state);
                } else {
-                       gpio_keys_polled_check_state(dev, &pdata->buttons[i],
+                       gpio_keys_polled_check_state(input, &pdata->buttons[i],
                                                     bdata);
                }
        }
@@ -122,18 +119,20 @@ static void gpio_keys_polled_poll(struct input_polled_dev *dev)
        input_sync(input);
 }
 
-static void gpio_keys_polled_open(struct input_polled_dev *dev)
+static int gpio_keys_polled_open(struct input_dev *input)
 {
-       struct gpio_keys_polled_dev *bdev = dev->private;
+       struct gpio_keys_polled_dev *bdev = input_get_drvdata(input);
        const struct gpio_keys_platform_data *pdata = bdev->pdata;
 
        if (pdata->enable)
                pdata->enable(bdev->dev);
+
+       return 0;
 }
 
-static void gpio_keys_polled_close(struct input_polled_dev *dev)
+static void gpio_keys_polled_close(struct input_dev *input)
 {
-       struct gpio_keys_polled_dev *bdev = dev->private;
+       struct gpio_keys_polled_dev *bdev = input_get_drvdata(input);
        const struct gpio_keys_platform_data *pdata = bdev->pdata;
 
        if (pdata->disable)
@@ -232,7 +231,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        struct fwnode_handle *child = NULL;
        const struct gpio_keys_platform_data *pdata = dev_get_platdata(dev);
        struct gpio_keys_polled_dev *bdev;
-       struct input_polled_dev *poll_dev;
        struct input_dev *input;
        int error;
        int i;
@@ -255,19 +253,13 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       poll_dev = devm_input_allocate_polled_device(dev);
-       if (!poll_dev) {
-               dev_err(dev, "no memory for polled device\n");
+       input = devm_input_allocate_device(dev);
+       if (!input) {
+               dev_err(dev, "no memory for input device\n");
                return -ENOMEM;
        }
 
-       poll_dev->private = bdev;
-       poll_dev->poll = gpio_keys_polled_poll;
-       poll_dev->poll_interval = pdata->poll_interval;
-       poll_dev->open = gpio_keys_polled_open;
-       poll_dev->close = gpio_keys_polled_close;
-
-       input = poll_dev->input;
+       input_set_drvdata(input, bdev);
 
        input->name = pdata->name ?: pdev->name;
        input->phys = DRV_NAME"/input0";
@@ -277,6 +269,9 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
        input->id.product = 0x0001;
        input->id.version = 0x0100;
 
+       input->open = gpio_keys_polled_open;
+       input->close = gpio_keys_polled_close;
+
        __set_bit(EV_KEY, input->evbit);
        if (pdata->rep)
                __set_bit(EV_REP, input->evbit);
@@ -352,11 +347,19 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        fwnode_handle_put(child);
 
-       bdev->poll_dev = poll_dev;
+       bdev->input = input;
        bdev->dev = dev;
        bdev->pdata = pdata;
 
-       error = input_register_polled_device(poll_dev);
+       error = input_setup_polling(input, gpio_keys_polled_poll);
+       if (error) {
+               dev_err(dev, "unable to set up polling, err=%d\n", error);
+               return error;
+       }
+
+       input_set_poll_interval(input, pdata->poll_interval);
+
+       error = input_register_device(input);
        if (error) {
                dev_err(dev, "unable to register polled device, err=%d\n",
                        error);
@@ -365,7 +368,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev)
 
        /* report initial state of the buttons */
        for (i = 0; i < pdata->nbuttons; i++)
-               gpio_keys_polled_check_state(poll_dev, &pdata->buttons[i],
+               gpio_keys_polled_check_state(input, &pdata->buttons[i],
                                             &bdev->data[i]);
 
        input_sync(input);