Input: wistron_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 wistron_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-11-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 a6b8af69915d9097de1cd33e95ccf78bdfc962e1..248e3b40bd24bb978923677e8661f4ca4d8822c4 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -346,7 +346,6 @@ config INPUT_CPCAP_PWRBUTTON
 config INPUT_WISTRON_BTNS
        tristate "x86 Wistron laptop button interface"
        depends on X86_32
-       select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        select NEW_LEDS
        select LEDS_CLASS

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 7ce6cc60d4d21c154633f94c2a6b7aba70847c01..80dfd72a02d307f258d7704ebabfa6812d9699c9 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -8,7 +8,7 @@
 #include <linux/io.h>
 #include <linux/dmi.h>
 #include <linux/init.h>
-#include <linux/input-polldev.h>
+#include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
@@ -1030,7 +1030,7 @@ static int __init select_keymap(void)
 
  /* Input layer interface */
 
-static struct input_polled_dev *wistron_idev;
+static struct input_dev *wistron_idev;
 static unsigned long jiffies_last_press;
 static bool wifi_enabled;
 static bool bluetooth_enabled;
@@ -1114,7 +1114,7 @@ static inline void wistron_led_resume(void)
 static void handle_key(u8 code)
 {
        const struct key_entry *key =
-               sparse_keymap_entry_from_scancode(wistron_idev->input, code);
+               sparse_keymap_entry_from_scancode(wistron_idev, code);
 
        if (key) {
                switch (key->type) {
@@ -1133,14 +1133,14 @@ static void handle_key(u8 code)
                        break;
 
                default:
-                       sparse_keymap_report_entry(wistron_idev->input,
-                                                  key, 1, true);
+                       sparse_keymap_report_entry(wistron_idev, key, 1, true);
                        break;
                }
                jiffies_last_press = jiffies;
-       } else
+       } else {
                printk(KERN_NOTICE
                        "wistron_btns: Unknown key code %02X\n", code);
+       }
 }
 
 static void poll_bios(bool discard)
@@ -1158,21 +1158,23 @@ static void poll_bios(bool discard)
        }
 }
 
-static void wistron_flush(struct input_polled_dev *dev)
+static int wistron_flush(struct input_dev *dev)
 {
        /* Flush stale event queue */
        poll_bios(true);
+
+       return 0;
 }
 
-static void wistron_poll(struct input_polled_dev *dev)
+static void wistron_poll(struct input_dev *dev)
 {
        poll_bios(false);
 
        /* Increase poll frequency if user is currently pressing keys (< 2s ago) */
        if (time_before(jiffies, jiffies_last_press + 2 * HZ))
-               dev->poll_interval = POLL_INTERVAL_BURST;
+               input_set_poll_interval(dev, POLL_INTERVAL_BURST);
        else
-               dev->poll_interval = POLL_INTERVAL_DEFAULT;
+               input_set_poll_interval(dev, POLL_INTERVAL_DEFAULT);
 }
 
 static int wistron_setup_keymap(struct input_dev *dev,
@@ -1208,35 +1210,37 @@ static int wistron_setup_keymap(struct input_dev *dev,
 
 static int setup_input_dev(void)
 {
-       struct input_dev *input_dev;
        int error;
 
-       wistron_idev = input_allocate_polled_device();
+       wistron_idev = input_allocate_device();
        if (!wistron_idev)
                return -ENOMEM;
 
+       wistron_idev->name = "Wistron laptop buttons";
+       wistron_idev->phys = "wistron/input0";
+       wistron_idev->id.bustype = BUS_HOST;
+       wistron_idev->dev.parent = &wistron_device->dev;
+
        wistron_idev->open = wistron_flush;
-       wistron_idev->poll = wistron_poll;
-       wistron_idev->poll_interval = POLL_INTERVAL_DEFAULT;
 
-       input_dev = wistron_idev->input;
-       input_dev->name = "Wistron laptop buttons";
-       input_dev->phys = "wistron/input0";
-       input_dev->id.bustype = BUS_HOST;
-       input_dev->dev.parent = &wistron_device->dev;
+       error = sparse_keymap_setup(wistron_idev, keymap, wistron_setup_keymap);
+       if (error)
+               goto err_free_dev;
 
-       error = sparse_keymap_setup(input_dev, keymap, wistron_setup_keymap);
+       error = input_setup_polling(wistron_idev, wistron_poll);
        if (error)
                goto err_free_dev;
 
-       error = input_register_polled_device(wistron_idev);
+       input_set_poll_interval(wistron_idev, POLL_INTERVAL_DEFAULT);
+
+       error = input_register_device(wistron_idev);
        if (error)
                goto err_free_dev;
 
        return 0;
 
  err_free_dev:
-       input_free_polled_device(wistron_idev);
+       input_free_device(wistron_idev);
        return error;
 }
 
@@ -1285,8 +1289,7 @@ static int wistron_probe(struct platform_device *dev)
 static int wistron_remove(struct platform_device *dev)
 {
        wistron_led_remove();
-       input_unregister_polled_device(wistron_idev);
-       input_free_polled_device(wistron_idev);
+       input_unregister_device(wistron_idev);
        bios_detach();
 
        return 0;