Input: sgi_btns - 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 sgi_btns driver to use
the polling mode of standard input devices and removes dependency on
INPUT_POLLDEV.

Link: https://lore.kernel.org/r/20191017204217.106453-15-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 05520bf4e31dae0cee3c5ce93992db2a99f48ce8..c27a9ee4ef9ac37588eaef6cee9ecdf7936e4707 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -543,7 +543,6 @@ config INPUT_UINPUT
 config INPUT_SGI_BTNS
        tristate "SGI Indy/O2 volume button interface"
        depends on SGI_IP22 || SGI_IP32
-       select INPUT_POLLDEV
        help
          Say Y here if you want to support SGI Indy/O2 volume button interface.
 

diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index 829277b4271f9275f54b7578945f431e0a5bc628..0657d785b3cc2ae133aefcebd1e8cfdf0b144881 100644 (file)
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2008  Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  */
-#include <linux/input-polldev.h>
+#include <linux/input.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -49,10 +49,9 @@ struct buttons_dev {
        int count[ARRAY_SIZE(sgi_map)];
 };
 
-static void handle_buttons(struct input_polled_dev *dev)
+static void handle_buttons(struct input_dev *input)
 {
-       struct buttons_dev *bdev = dev->private;
-       struct input_dev *input = dev->input;
+       struct buttons_dev *bdev = input_get_drvdata(input);
        u8 status;
        int i;
 
@@ -79,7 +78,6 @@ static void handle_buttons(struct input_polled_dev *dev)
 static int sgi_buttons_probe(struct platform_device *pdev)
 {
        struct buttons_dev *bdev;
-       struct input_polled_dev *poll_dev;
        struct input_dev *input;
        int error, i;
 
@@ -87,17 +85,14 @@ static int sgi_buttons_probe(struct platform_device *pdev)
        if (!bdev)
                return -ENOMEM;
 
-       poll_dev = devm_input_allocate_polled_device(&pdev->dev);
-       if (!poll_dev)
+       input = devm_input_allocate_device(&pdev->dev);
+       if (!input)
                return -ENOMEM;
 
        memcpy(bdev->keymap, sgi_map, sizeof(bdev->keymap));
 
-       poll_dev->private = bdev;
-       poll_dev->poll = handle_buttons;
-       poll_dev->poll_interval = BUTTONS_POLL_INTERVAL;
+       input_set_drvdata(input, bdev);
 
-       input = poll_dev->input;
        input->name = "SGI buttons";
        input->phys = "sgi/input0";
        input->id.bustype = BUS_HOST;
@@ -112,7 +107,13 @@ static int sgi_buttons_probe(struct platform_device *pdev)
                __set_bit(bdev->keymap[i], input->keybit);
        __clear_bit(KEY_RESERVED, input->keybit);
 
-       error = input_register_polled_device(poll_dev);
+       error = input_setup_polling(input, handle_buttons);
+       if (error)
+               return error;
+
+       input_set_poll_interval(input, BUTTONS_POLL_INTERVAL);
+
+       error = input_register_device(input);
        if (error)
                return error;