kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Link: https://lore.kernel.org/r/20191017204217.106453-17-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2019-10-29 17:04:33 -07:00
parent 528c7d02c7
commit 36bc3684c2
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/input/misc/Kconfig
View file

@ -633,7 +633,6 @@ config INPUT_RB532_BUTTON
tristate "Mikrotik Routerboard 532 button interface"
depends on MIKROTIK_RB532
depends on GPIOLIB
select INPUT_POLLDEV
help
Say Y here if you want support for the S1 button built into
Mikrotik's Routerboard 532.

32
drivers/input/misc/rb532_button.c
View file

@ -5,7 +5,7 @@
* Copyright (C) 2009 Phil Sutter <n0-1@freewrt.org>
*/
#include <linux/input-polldev.h>
#include <linux/input.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
@ -46,32 +46,34 @@ static bool rb532_button_pressed(void)
return !val;
}
static void rb532_button_poll(struct input_polled_dev *poll_dev)
static void rb532_button_poll(struct input_dev *input)
{
input_report_key(poll_dev->input, RB532_BTN_KSYM,
rb532_button_pressed());
input_sync(poll_dev->input);
input_report_key(input, RB532_BTN_KSYM, rb532_button_pressed());
input_sync(input);
}
static int rb532_button_probe(struct platform_device *pdev)
{
struct input_polled_dev *poll_dev;
struct input_dev *input;
int error;
poll_dev = devm_input_allocate_polled_device(&pdev->dev);
if (!poll_dev)
input = devm_input_allocate_device(&pdev->dev);
if (!input)
return -ENOMEM;
poll_dev->poll = rb532_button_poll;
poll_dev->poll_interval = RB532_BTN_RATE;
input->name = "rb532 button";
input->phys = "rb532/button0";
input->id.bustype = BUS_HOST;
poll_dev->input->name = "rb532 button";
poll_dev->input->phys = "rb532/button0";
poll_dev->input->id.bustype = BUS_HOST;
input_set_capability(input, EV_KEY, RB532_BTN_KSYM);
input_set_capability(poll_dev->input, EV_KEY, RB532_BTN_KSYM);
error = input_setup_polling(input, rb532_button_poll);
if (error)
return error;
error = input_register_polled_device(poll_dev);
input_set_poll_interval(input, RB532_BTN_RATE);
error = input_register_device(input);
if (error)
return error;