Skip to contentSkip to conversation

Stop using input_polled_dev in polling drivers

PATCH In review Dmitry Torokhov 4 participants 28 messages Oct 17, 2019 – Oct 22, 2019

Subsystems (4)
lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

cover Stop using input_polled_dev in polling drivers

Input devices now support polling mode natively (via input_setup_polling API), and input_polled_dev implementation is going away. This series switches drivers found in drivers/input to the new scheme.

Dmitry Torokhov (21):
Input: raspberrypi-ts - switch to using polled mode of input devices
Input: sur40 - switch to using polled mode of input devices
Input: ts4800-ts - switch to using polled mode of input devices
Input: tsc6507x-ts - switch to using polled mode of input devices
Input: adc-keys - switch to using polled mode of input devices
Input: clps711x-keypad - switch to using polled mode of input devices
Input: jornada680_kbd - switch to using polled mode of input devices
Input: gpio_keys_polled - switch to using polled mode of input devices
Input: apanel - switch to using polled mode of input devices
Input: wistron_btns - switch to using polled mode of input devices
Input: cobalt_btns - convert to use managed resources
Input: cobalt_btns - switch to using polled mode of input devices
Input: sgi_btns - switch to using managed resources
Input: sgi_btns - switch to using polled mode of input devices
Input: rb532_button - switch to using managed resources
Input: rb532_button - switch to using polled mode of input devices
Input: gpio_decoder - switch to using polled mode of input devices
Input: mma8450 - switch to using polled mode of input devices
Input: bma150 - switch to using polled mode of input devices
Input: kxtj9 - switch to using managed resources
Input: kxtj9 - switch to using polled mode of input devices

Jonathan Bakker (1):
Input: bma150 - use managed resources helpers

 drivers/input/keyboard/Kconfig             |   4 -
 drivers/input/keyboard/adc-keys.c          |  36 ++--
 drivers/input/keyboard/clps711x-keypad.c   |  70 +++----
 drivers/input/keyboard/gpio_keys_polled.c  |  65 +++---
 drivers/input/keyboard/jornada680_kbd.c    |  37 ++--
 drivers/input/misc/Kconfig                 |  15 --
 drivers/input/misc/apanel.c                | 153 ++++++--------
 drivers/input/misc/bma150.c                | 190 +++++------------
 drivers/input/misc/cobalt_btns.c           |  73 +++----
 drivers/input/misc/gpio_decoder.c          |  42 ++--
 drivers/input/misc/kxtj9.c                 | 224 ++++++---------------
 drivers/input/misc/mma8450.c               | 101 +++++-----
 drivers/input/misc/rb532_button.c          |  48 ++---
 drivers/input/misc/sgi_btns.c              |  54 ++---
 drivers/input/misc/wistron_btns.c          |  51 ++---
 drivers/input/touchscreen/Kconfig          |   4 -
 drivers/input/touchscreen/raspberrypi-ts.c |  38 ++--
 drivers/input/touchscreen/sur40.c          |  92 +++++----
 drivers/input/touchscreen/tps6507x-ts.c    |  36 ++--
 drivers/input/touchscreen/ts4800-ts.c      |  68 ++++---
 20 files changed, 557 insertions(+), 844 deletions(-)
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#1 lore raw

PATCH 1/22 Input: raspberrypi-ts - 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 raspberrypi-ts driver to use the polling mode of standard input devices and removes dependency on INPUT_POLLDEV.

---

 drivers/input/touchscreen/Kconfig          |  1 -
 drivers/input/touchscreen/raspberrypi-ts.c | 38 ++++++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)
drivers/input/touchscreen/Kconfig +0 -1
index 46ad9090493b..00e7a9f218bc 100644
@@ -700,7 +700,6 @@ config TOUCHSCREEN_EDT_FT5X06
 config TOUCHSCREEN_RASPBERRYPI_FW
 	tristate "Raspberry Pi's firmware base touch screen support"
 	depends on RASPBERRYPI_FIRMWARE || (RASPBERRYPI_FIRMWARE=n && COMPILE_TEST)
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you have the official Raspberry Pi 7 inch screen on
 	  your system.
drivers/input/touchscreen/raspberrypi-ts.c +20 -18
index 69881265d121..0e2e08f3f433 100644
@@ -16,7 +16,6 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
-#include <linux/input-polldev.h>
 #include <linux/input/touchscreen.h>
 #include <soc/bcm2835/raspberrypi-firmware.h>
 
@@ -34,7 +33,7 @@
 
 struct rpi_ts {
 	struct platform_device *pdev;
-	struct input_polled_dev *poll_dev;
+	struct input_dev *input;
 	struct touchscreen_properties prop;
 
 	void __iomem *fw_regs_va;
@@ -57,10 +56,9 @@ struct rpi_ts_regs {
 	} point[RPI_TS_MAX_SUPPORTED_POINTS];
 };
 
-static void rpi_ts_poll(struct input_polled_dev *dev)
+static void rpi_ts_poll(struct input_dev *input)
 {
-	struct input_dev *input = dev->input;
-	struct rpi_ts *ts = dev->private;
+	struct rpi_ts *ts = input_get_drvdata(input);
 	struct rpi_ts_regs regs;
 	int modified_ids = 0;
 	long released_ids;
@@ -123,10 +121,9 @@ static int rpi_ts_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct device_node *np = dev->of_node;
-	struct input_polled_dev *poll_dev;
+	struct input_dev *input;
 	struct device_node *fw_node;
 	struct rpi_firmware *fw;
-	struct input_dev *input;
 	struct rpi_ts *ts;
 	u32 touchbuf;
 	int error;
@@ -160,7 +157,6 @@ static int rpi_ts_probe(struct platform_device *pdev)
 		return error;
 	}
 
-
 	touchbuf = (u32)ts->fw_regs_phys;
 	error = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF,
 				      &touchbuf, sizeof(touchbuf));
@@ -170,19 +166,17 @@ static int rpi_ts_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	poll_dev = devm_input_allocate_polled_device(dev);
-	if (!poll_dev) {
+	input = devm_input_allocate_device(dev);
+	if (!input) {
 		dev_err(dev, "Failed to allocate input device\n");
 		return -ENOMEM;
 	}
-	ts->poll_dev = poll_dev;
-	input = poll_dev->input;
+
+	ts->input = input;
+	input_set_drvdata(input, ts);
 
 	input->name = "raspberrypi-ts";
 	input->id.bustype = BUS_HOST;
-	poll_dev->poll_interval = RPI_TS_POLL_INTERVAL;
-	poll_dev->poll = rpi_ts_poll;
-	poll_dev->private = ts;
 
 	input_set_abs_params(input, ABS_MT_POSITION_X, 0,
 			     RPI_TS_DEFAULT_WIDTH, 0, 0);
@@ -197,7 +191,15 @@ static int rpi_ts_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	error = input_register_polled_device(poll_dev);
+	error = input_setup_polling(input, rpi_ts_poll);
+	if (error) {
+		dev_err(dev, "could not set up polling mode, %d\n", error);
+		return error;
+	}
+
+	input_set_poll_interval(input, RPI_TS_POLL_INTERVAL);
+
+	error = input_register_device(input);
 	if (error) {
 		dev_err(dev, "could not register input device, %d\n", error);
 		return error;
@@ -214,10 +216,10 @@ MODULE_DEVICE_TABLE(of, rpi_ts_match);
 
 static struct platform_driver rpi_ts_driver = {
 	.driver = {
-		.name   = "raspberrypi-ts",
+		.name = "raspberrypi-ts",
 		.of_match_table = rpi_ts_match,
 	},
-	.probe          = rpi_ts_probe,
+	.probe = rpi_ts_probe,
 };
 module_platform_driver(rpi_ts_driver);
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#2 lore raw

PATCH 2/22 Input: sur40 - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/touchscreen/Kconfig |  1 -
 drivers/input/touchscreen/sur40.c | 92 ++++++++++++++++++-------------
 2 files changed, 53 insertions(+), 40 deletions(-)
drivers/input/touchscreen/Kconfig +0 -1
index 00e7a9f218bc..df9cb92166c3 100644
@@ -1209,7 +1209,6 @@ config TOUCHSCREEN_SUR40
 	tristate "Samsung SUR40 (Surface 2.0/PixelSense) touchscreen"
 	depends on USB && MEDIA_USB_SUPPORT && HAS_DMA
 	depends on VIDEO_V4L2
-	select INPUT_POLLDEV
 	select VIDEOBUF2_DMA_SG
 	help
 	  Say Y here if you want support for the Samsung SUR40 touchscreen
drivers/input/touchscreen/sur40.c +53 -39

191 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#3 lore raw

PATCH 3/22 Input: ts4800-ts - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/touchscreen/Kconfig     |  1 -
 drivers/input/touchscreen/ts4800-ts.c | 68 +++++++++++++++------------
 2 files changed, 38 insertions(+), 31 deletions(-)
drivers/input/touchscreen/Kconfig +0 -1
index df9cb92166c3..2c00232b2506 100644
@@ -1037,7 +1037,6 @@ config TOUCHSCREEN_TS4800
 	depends on HAS_IOMEM && OF
 	depends on SOC_IMX51 || COMPILE_TEST
 	select MFD_SYSCON
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you have a touchscreen on a TS-4800 board.
 
drivers/input/touchscreen/ts4800-ts.c +38 -30

123 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#4 lore raw

PATCH 4/22 Input: tsc6507x-ts - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/touchscreen/Kconfig       |  1 -
 drivers/input/touchscreen/tps6507x-ts.c | 36 ++++++++++++-------------
 2 files changed, 17 insertions(+), 20 deletions(-)
drivers/input/touchscreen/Kconfig +0 -1
index 2c00232b2506..40bfc551ce30 100644
@@ -1243,7 +1243,6 @@ config TOUCHSCREEN_SX8654
 config TOUCHSCREEN_TPS6507X
 	tristate "TPS6507x based touchscreens"
 	depends on I2C
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you have a TPS6507x based touchscreen
 	  controller.
drivers/input/touchscreen/tps6507x-ts.c +17 -19
index 75170a7439b1..357a3108f2e5 100644
@@ -17,7 +17,6 @@
 #include <linux/workqueue.h>
 #include <linux/slab.h>
 #include <linux/input.h>
-#include <linux/input-polldev.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
@@ -40,7 +39,7 @@ struct ts_event {
 
 struct tps6507x_ts {
 	struct device		*dev;
-	struct input_polled_dev	*poll_dev;
+	struct input_dev	*input;
 	struct tps6507x_dev	*mfd;
 	char			phys[32];
 	struct ts_event		tc;
@@ -148,10 +147,9 @@ static s32 tps6507x_adc_standby(struct tps6507x_ts *tsc)
 	return ret;
 }
 
-static void tps6507x_ts_poll(struct input_polled_dev *poll_dev)
+static void tps6507x_ts_poll(struct input_dev *input_dev)
 {
-	struct tps6507x_ts *tsc = poll_dev->private;
-	struct input_dev *input_dev = poll_dev->input;
+	struct tps6507x_ts *tsc = input_get_drvdata(input_dev);
 	bool pendown;
 	s32 ret;
 
@@ -205,7 +203,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 	const struct tps6507x_board *tps_board;
 	const struct touchscreen_init_data *init_data;
 	struct tps6507x_ts *tsc;
-	struct input_polled_dev *poll_dev;
 	struct input_dev *input_dev;
 	int error;
 
@@ -240,23 +237,16 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 	snprintf(tsc->phys, sizeof(tsc->phys),
 		 "%s/input0", dev_name(tsc->dev));
 
-	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
-	if (!poll_dev) {
+	input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!input_dev) {
 		dev_err(tsc->dev, "Failed to allocate polled input device.\n");
 		return -ENOMEM;
 	}
 
-	tsc->poll_dev = poll_dev;
-
-	poll_dev->private = tsc;
-	poll_dev->poll = tps6507x_ts_poll;
-	poll_dev->poll_interval = init_data ?
-			init_data->poll_period : TSC_DEFAULT_POLL_PERIOD;
-
-	input_dev = poll_dev->input;
-	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-	input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+	tsc->input = input_dev;
+	input_set_drvdata(input_dev, tsc);
 
+	input_set_capability(input_dev, EV_KEY, BTN_TOUCH);
 	input_set_abs_params(input_dev, ABS_X, 0, MAX_10BIT, 0, 0);
 	input_set_abs_params(input_dev, ABS_Y, 0, MAX_10BIT, 0, 0);
 	input_set_abs_params(input_dev, ABS_PRESSURE, 0, MAX_10BIT, 0, 0);
@@ -275,7 +265,15 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
 	if (error)
 		return error;
 
-	error = input_register_polled_device(poll_dev);
+	error = input_setup_polling(input_dev, tps6507x_ts_poll);
+	if (error)
+		return error;
+
+	input_set_poll_interval(input_dev,
+				init_data ? init_data->poll_period :
+					    TSC_DEFAULT_POLL_PERIOD);
+
+	error = input_register_device(input_dev);
 	if (error)
 		return error;
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#5 lore raw

PATCH 5/22 Input: adc-keys - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/keyboard/Kconfig    |  1 -
 drivers/input/keyboard/adc-keys.c | 36 ++++++++++++++++---------------
 2 files changed, 19 insertions(+), 18 deletions(-)
drivers/input/keyboard/Kconfig +0 -1
index a716a90de683..c6bf99d23b1a 100644
@@ -16,7 +16,6 @@ if INPUT_KEYBOARD
 config KEYBOARD_ADC
 	tristate "ADC Ladder Buttons"
 	depends on IIO
-	select INPUT_POLLDEV
 	help
 	  This driver implements support for buttons connected
 	  to an ADC using a resistor ladder.
drivers/input/keyboard/adc-keys.c +19 -17
index 9885fd56f5f9..6d5be48d1b3d 100644
@@ -9,7 +9,6 @@
 #include <linux/iio/consumer.h>
 #include <linux/iio/types.h>
 #include <linux/input.h>
-#include <linux/input-polldev.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -30,9 +29,9 @@ struct adc_keys_state {
 	const struct adc_keys_button *map;
 };
 
-static void adc_keys_poll(struct input_polled_dev *dev)
+static void adc_keys_poll(struct input_dev *input)
 {
-	struct adc_keys_state *st = dev->private;
+	struct adc_keys_state *st = input_get_drvdata(input);
 	int i, value, ret;
 	u32 diff, closest = 0xffffffff;
 	int keycode = 0;
@@ -55,12 +54,12 @@ static void adc_keys_poll(struct input_polled_dev *dev)
 		keycode = 0;
 
 	if (st->last_key && st->last_key != keycode)
-		input_report_key(dev->input, st->last_key, 0);
+		input_report_key(input, st->last_key, 0);
 
 	if (keycode)
-		input_report_key(dev->input, keycode, 1);
+		input_report_key(input, keycode, 1);
 
-	input_sync(dev->input);
+	input_sync(input);
 	st->last_key = keycode;
 }
 
@@ -108,7 +107,6 @@ static int adc_keys_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct adc_keys_state *st;
-	struct input_polled_dev *poll_dev;
 	struct input_dev *input;
 	enum iio_chan_type type;
 	int i, value;
@@ -145,19 +143,13 @@ static int adc_keys_probe(struct platform_device *pdev)
 	if (error)
 		return error;
 
-	poll_dev = devm_input_allocate_polled_device(dev);
-	if (!poll_dev) {
+	input = devm_input_allocate_device(dev);
+	if (!input) {
 		dev_err(dev, "failed to allocate input device\n");
 		return -ENOMEM;
 	}
 
-	if (!device_property_read_u32(dev, "poll-interval", &value))
-		poll_dev->poll_interval = value;
-
-	poll_dev->poll = adc_keys_poll;
-	poll_dev->private = st;
-
-	input = poll_dev->input;
+	input_set_drvdata(input, st);
 
 	input->name = pdev->name;
 	input->phys = "adc-keys/input0";
@@ -174,7 +166,17 @@ static int adc_keys_probe(struct platform_device *pdev)
 	if (device_property_read_bool(dev, "autorepeat"))
 		__set_bit(EV_REP, input->evbit);
 
-	error = input_register_polled_device(poll_dev);
+
+	error = input_setup_polling(input, adc_keys_poll);
+	if (error) {
+		dev_err(dev, "Unable to set up polling: %d\n", error);
+		return error;
+	}
+
+	if (!device_property_read_u32(dev, "poll-interval", &value))
+		input_set_poll_interval(input, value);
+
+	error = input_register_device(input);
 	if (error) {
 		dev_err(dev, "Unable to register input device: %d\n", error);
 		return error;
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#6 lore raw

PATCH 6/22 Input: clps711x-keypad - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

Also use managed API when allocating input device, this allows us to remove clps711x_keypad_remove() method.

---

 drivers/input/keyboard/Kconfig           |  1 -
 drivers/input/keyboard/clps711x-keypad.c | 70 ++++++++++--------------
 2 files changed, 29 insertions(+), 42 deletions(-)
drivers/input/keyboard/Kconfig +0 -1
index c6bf99d23b1a..0e7368288dae 100644
@@ -190,7 +190,6 @@ config KEYBOARD_CLPS711X
 	tristate "CLPS711X Keypad support"
 	depends on OF_GPIO && (ARCH_CLPS711X || COMPILE_TEST)
 	select INPUT_MATRIXKMAP
-	select INPUT_POLLDEV
 	help
 	  Say Y here to enable the matrix keypad on the Cirrus Logic
 	  CLPS711X CPUs.
drivers/input/keyboard/clps711x-keypad.c +29 -41

134 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#7 lore raw

PATCH 7/22 Input: jornada680_kbd - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/keyboard/Kconfig          |  1 -
 drivers/input/keyboard/jornada680_kbd.c | 37 +++++++++++++------------
 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/input/keyboard/Kconfig +0 -1
index 0e7368288dae..54b1905ebbfe 100644
@@ -340,7 +340,6 @@ config KEYBOARD_HIL
 config KEYBOARD_HP6XX
 	tristate "HP Jornada 6xx keyboard"
 	depends on SH_HP6XX
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you have a HP Jornada 620/660/680/690 and want to
 	  support the built-in keyboard.
drivers/input/keyboard/jornada680_kbd.c +19 -18
index 4232aa876d2e..7e35081393be 100644
@@ -15,7 +15,6 @@
 
 #include <linux/device.h>
 #include <linux/input.h>
-#include <linux/input-polldev.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
@@ -64,7 +63,7 @@ static const unsigned short jornada_scancodes[] = {
 #define JORNADA_SCAN_SIZE	18
 
 struct jornadakbd {
-	struct input_polled_dev *poll_dev;
+	struct input_dev *input;
 	unsigned short keymap[ARRAY_SIZE(jornada_scancodes)];
 	unsigned char length;
 	unsigned char old_scan[JORNADA_SCAN_SIZE];
@@ -73,7 +72,7 @@ struct jornadakbd {
 
 static void jornada_parse_kbd(struct jornadakbd *jornadakbd)
 {
-	struct input_dev *input_dev = jornadakbd->poll_dev->input;
+	struct input_dev *input_dev = jornadakbd->input;
 	unsigned short *keymap = jornadakbd->keymap;
 	unsigned int sync_me = 0;
 	unsigned int i, j;
@@ -167,9 +166,9 @@ static void jornada_scan_keyb(unsigned char *s)
 	*s++ = __raw_readb(PHDR);
 }
 
-static void jornadakbd680_poll(struct input_polled_dev *dev)
+static void jornadakbd680_poll(struct input_dev *input)
 {
-	struct jornadakbd *jornadakbd = dev->private;
+	struct jornadakbd *jornadakbd = input_get_drvdata(input);
 
 	jornada_scan_keyb(jornadakbd->new_scan);
 	jornada_parse_kbd(jornadakbd);
@@ -179,7 +178,6 @@ static void jornadakbd680_poll(struct input_polled_dev *dev)
 static int jornada680kbd_probe(struct platform_device *pdev)
 {
 	struct jornadakbd *jornadakbd;
-	struct input_polled_dev *poll_dev;
 	struct input_dev *input_dev;
 	int i, error;
 
@@ -188,29 +186,24 @@ static int jornada680kbd_probe(struct platform_device *pdev)
 	if (!jornadakbd)
 		return -ENOMEM;
 
-	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
-	if (!poll_dev) {
-		dev_err(&pdev->dev, "failed to allocate polled input device\n");
+	input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!input_dev) {
+		dev_err(&pdev->dev, "failed to allocate input device\n");
 		return -ENOMEM;
 	}
 
-	jornadakbd->poll_dev = poll_dev;
+	jornadakbd->input = input_dev;
 
 	memcpy(jornadakbd->keymap, jornada_scancodes,
 		sizeof(jornadakbd->keymap));
 
-	poll_dev->private = jornadakbd;
-	poll_dev->poll = jornadakbd680_poll;
-	poll_dev->poll_interval = 50; /* msec */
-
-	input_dev = poll_dev->input;
+	input_set_drvdata(input_dev, jornadakbd);
 	input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
 	input_dev->name = "HP Jornada 680 keyboard";
 	input_dev->phys = "jornadakbd/input0";
 	input_dev->keycode = jornadakbd->keymap;
 	input_dev->keycodesize = sizeof(unsigned short);
 	input_dev->keycodemax = ARRAY_SIZE(jornada_scancodes);
-	input_dev->dev.parent = &pdev->dev;
 	input_dev->id.bustype = BUS_HOST;
 
 	for (i = 0; i < 128; i++)
@@ -220,9 +213,17 @@ static int jornada680kbd_probe(struct platform_device *pdev)
 
 	input_set_capability(input_dev, EV_MSC, MSC_SCAN);
 
-	error = input_register_polled_device(jornadakbd->poll_dev);
+	error = input_setup_polling(input_dev, jornadakbd680_poll);
+	if (error) {
+		dev_err(&pdev->dev, "failed to set up polling\n");
+		return error;
+	}
+
+	input_set_poll_interval(input_dev, 50 /* msec */);
+
+	error = input_register_device(input_dev);
 	if (error) {
-		dev_err(&pdev->dev, "failed to register polled input device\n");
+		dev_err(&pdev->dev, "failed to register input device\n");
 		return error;
 	}
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#8 lore raw

PATCH 8/22 Input: gpio_keys_polled - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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.

---

 drivers/input/keyboard/Kconfig            |  1 -
 drivers/input/keyboard/gpio_keys_polled.c | 65 ++++++++++++-----------
 2 files changed, 34 insertions(+), 32 deletions(-)
drivers/input/keyboard/Kconfig +0 -1
index 54b1905ebbfe..2856b4f72b12 100644
@@ -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.
drivers/input/keyboard/gpio_keys_polled.c +34 -31

166 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#9 lore raw

PATCH 9/22 Input: apanel - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

While at it, let's convert the driver to use devm.

---

 drivers/input/misc/Kconfig  |   1 -
 drivers/input/misc/apanel.c | 153 +++++++++++++++---------------------
 2 files changed, 64 insertions(+), 90 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 7d9ae394e597..a6b8af69915d 100644
@@ -257,7 +257,6 @@ config INPUT_MMA8450
 config INPUT_APANEL
 	tristate "Fujitsu Lifebook Application Panel buttons"
 	depends on X86 && I2C && LEDS_CLASS
-	select INPUT_POLLDEV
 	select CHECK_SIGNATURE
 	help
 	 Say Y here for support of the Application Panel buttons, used on
drivers/input/misc/apanel.c +64 -89

226 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
#10 lore raw

Re: [PATCH 09/22] Input: apanel - switch to using polled mode of input devices

Hi Dmitry, a few minor nags below, inline.

Quoted 43 lines · Dmitry Torokhov

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

While at it, let's convert the driver to use devm.

---

 drivers/input/misc/Kconfig  |   1 -
 drivers/input/misc/apanel.c | 153 +++++++++++++++---------------------
 2 files changed, 64 insertions(+), 90 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 7d9ae394e597..a6b8af69915d 100644
@@ -257,7 +257,6 @@ config INPUT_MMA8450
 config INPUT_APANEL
        tristate "Fujitsu Lifebook Application Panel buttons"
        depends on X86 && I2C && LEDS_CLASS
-       select INPUT_POLLDEV
        select CHECK_SIGNATURE
        help
         Say Y here for support of the Application Panel buttons, used on
drivers/input/misc/apanel.c +1 -1
index 53ec40d1b90d..de0deb432fe3 100644
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
-#include <linux/input-polldev.h>
+#include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
 
@@ -51,19 +51,28 @@ static enum apanel_chip device_chip[APANEL_DEV_MAX];
 #define MAX_PANEL_KEYS 12
 
 struct apanel {

drivers/input/misc/apanel.c static enum apanel_chip device_chip[APANEL_DEV_MAX]; · line 61

Quoted 10 lines
drivers/input/misc/apanel.c +3 -2
-       struct input_polled_dev *ipdev;
+       struct input_dev *idev;
        struct i2c_client *client;
        unsigned short keymap[MAX_PANEL_KEYS];
-       u16    nkeys;
+       u16 nkeys;
        struct led_classdev mail_led;
 };
 
+static unsigned short apanel_keymap[MAX_PANEL_KEYS] = {

Could this be const?

Quoted 177 lines
drivers/input/misc/apanel.c +37 -84
+       [0] = KEY_MAIL,
+       [1] = KEY_WWW,
+       [2] = KEY_PROG2,
+       [3] = KEY_PROG1,
 
-static int apanel_probe(struct i2c_client *, const struct i2c_device_id *);
+       [8] = KEY_FORWARD,
+       [9] = KEY_REWIND,
+       [10] = KEY_STOPCD,
+       [11] = KEY_PLAYPAUSE,
+};
 
 static void report_key(struct input_dev *input, unsigned keycode)
 {
-       pr_debug(APANEL ": report key %#x\n", keycode);
+       dev_dbg(input->dev.parent, "report key %#x\n", keycode);
        input_report_key(input, keycode, 1);
        input_sync(input);
 
@@ -79,10 +88,9 @@ static void report_key(struct input_dev *input, unsigned keycode)
  * CD keys:
  * Forward (0x100), Rewind (0x200), Stop (0x400), Pause (0x800)
  */
-static void apanel_poll(struct input_polled_dev *ipdev)
+static void apanel_poll(struct input_dev *idev)
 {
-       struct apanel *ap = ipdev->private;
-       struct input_dev *idev = ipdev->input;
+       struct apanel *ap = input_get_drvdata(idev);
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
        s32 data;
        int i;
@@ -112,126 +120,93 @@ static int mail_led_set(struct led_classdev *led,
        return i2c_smbus_write_word_data(ap->client, 0x10, led_bits);
 }
 
-static int apanel_remove(struct i2c_client *client)
-{
-       struct apanel *ap = i2c_get_clientdata(client);
-
-       if (device_chip[APANEL_DEV_LED] != CHIP_NONE)
-               led_classdev_unregister(&ap->mail_led);
-
-       input_unregister_polled_device(ap->ipdev);
-       input_free_polled_device(ap->ipdev);
-
-       return 0;
-}
-
-static void apanel_shutdown(struct i2c_client *client)
-{
-       apanel_remove(client);
-}
-
-static const struct i2c_device_id apanel_id[] = {
-       { "fujitsu_apanel", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, apanel_id);
-
-static struct i2c_driver apanel_driver = {
-       .driver = {
-               .name = APANEL,
-       },
-       .probe          = &apanel_probe,
-       .remove         = &apanel_remove,
-       .shutdown       = &apanel_shutdown,
-       .id_table       = apanel_id,
-};
-
-static struct apanel apanel = {
-       .keymap = {
-               [0] = KEY_MAIL,
-               [1] = KEY_WWW,
-               [2] = KEY_PROG2,
-               [3] = KEY_PROG1,
-
-               [8] = KEY_FORWARD,
-               [9] = KEY_REWIND,
-               [10] = KEY_STOPCD,
-               [11] = KEY_PLAYPAUSE,
-
-       },
-       .mail_led = {
-               .name = "mail:blue",
-               .brightness_set_blocking = mail_led_set,
-       },
-};
-
-/* NB: Only one panel on the i2c. */
 static int apanel_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
        struct apanel *ap;
-       struct input_polled_dev *ipdev;
        struct input_dev *idev;
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
-       int i, err = -ENOMEM;
+       int i, err;
 
-       ap = &apanel;
+       ap = devm_kzalloc(&client->dev, sizeof(*ap), GFP_KERNEL);
+       if (!ap)
+               return -ENOMEM;
 
-       ipdev = input_allocate_polled_device();
-       if (!ipdev)
-               goto out1;
+       idev = devm_input_allocate_device(&client->dev);
+       if (!idev)
+               return -ENOMEM;
 
-       ap->ipdev = ipdev;
+       ap->idev = idev;
        ap->client = client;
 
        i2c_set_clientdata(client, ap);
 
        err = i2c_smbus_write_word_data(client, cmd, 0);
        if (err) {
-               dev_warn(&client->dev, APANEL ": smbus write error %d\n",
-                        err);
-               goto out3;
+               dev_warn(&client->dev, "smbus write error %d\n", err);
+               return err;
        }
 
-       ipdev->poll = apanel_poll;
-       ipdev->poll_interval = POLL_INTERVAL_DEFAULT;
-       ipdev->private = ap;
+       input_set_drvdata(idev, ap);
 
-       idev = ipdev->input;
        idev->name = APANEL_NAME " buttons";
        idev->phys = "apanel/input0";
        idev->id.bustype = BUS_HOST;
-       idev->dev.parent = &client->dev;
-
-       set_bit(EV_KEY, idev->evbit);
 
+       memcpy(ap->keymap, apanel_keymap, sizeof(apanel_keymap));
        idev->keycode = ap->keymap;
        idev->keycodesize = sizeof(ap->keymap[0]);
        idev->keycodemax = (device_chip[APANEL_DEV_CDBTN] != CHIP_NONE) ? 12 : 4;
 
+       set_bit(EV_KEY, idev->evbit);
        for (i = 0; i < idev->keycodemax; i++)
                if (ap->keymap[i])
                        set_bit(ap->keymap[i], idev->keybit);
 
-       err = input_register_polled_device(ipdev);
+       err = input_setup_polling(idev, apanel_poll);
+       if (err)
+               return err;
+
+       input_set_poll_interval(idev, POLL_INTERVAL_DEFAULT);
+
+       err = input_register_device(idev);
        if (err)
-               goto out3;
+               return err;
 
        if (device_chip[APANEL_DEV_LED] != CHIP_NONE) {
-               err = led_classdev_register(&client->dev, &ap->mail_led);
+               ap->mail_led.name = "mail:blue";
+               ap->mail_led.brightness_set_blocking = mail_led_set;
+               err = devm_led_classdev_register(&client->dev, &ap->mail_led);
                if (err)
-                       goto out4;
+                       return err;
        }
 
        return 0;
-out4:
-       input_unregister_polled_device(ipdev);
-out3:
-       input_free_polled_device(ipdev);

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 192

Quoted 10 lines
drivers/input/misc/apanel.c +6 -2
-out1:
-       return err;
 }
 
+static void apanel_shutdown(struct i2c_client *client)
+{
+       struct apanel *ap = i2c_get_clientdata(client);
+
+       if (device_chip[APANEL_DEV_LED] != CHIP_NONE)
+               led_set_brightness(&ap->mail_led, LED_OFF);

Is this code required? Doesn't led_class_dev_unregister() (automatically called by devm_) switch the led off?

If it's not required, then the whole shutdown function can be removed.

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 196

Quoted 4 lines
drivers/input/misc/apanel.c +4 -0
+}
+
+static const struct i2c_device_id apanel_id[] = {
+       { "fujitsu_apanel", 0 },

If the driver_data field of i2c_device_id is unused, would it be better to match via apanel_driver.driver.of_match_table ?

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 206

Quoted 10 lines
drivers/input/misc/apanel.c +10 -0
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, apanel_id);
+
+static struct i2c_driver apanel_driver = {
+       .driver = {
+               .name = APANEL,
+       },
+       .probe          = &apanel_probe,
+       .shutdown       = &apanel_shutdown,

The ampersand (&) can be removed.
I realize that this is just old code that has changed position.

Quoted 9 lines
drivers/input/misc/apanel.c +3 -1
+       .id_table       = apanel_id,
+};
+
 /* Scan the system ROM for the signature "FJKEYINF" */
 static __init const void __iomem *bios_signature(const void __iomem *bios)
 {
--

2.23.0.866.gb869b98d4c-goog

author maintainer
#11 lore raw

Re: [PATCH 09/22] Input: apanel - switch to using polled mode of input devices

Hi Sven,

Quoted 1 line · Sven Van Asbroeck

Hi Dmitry, a few minor nags below, inline.

Thanks for taking a look.

Quoted 55 lines
Quoted 52 lines · Dmitry Torokhov

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

While at it, let's convert the driver to use devm.

---

 drivers/input/misc/Kconfig  |   1 -
 drivers/input/misc/apanel.c | 153 +++++++++++++++---------------------
 2 files changed, 64 insertions(+), 90 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 7d9ae394e597..a6b8af69915d 100644
@@ -257,7 +257,6 @@ config INPUT_MMA8450
 config INPUT_APANEL
        tristate "Fujitsu Lifebook Application Panel buttons"
        depends on X86 && I2C && LEDS_CLASS
-       select INPUT_POLLDEV
        select CHECK_SIGNATURE
        help
         Say Y here for support of the Application Panel buttons, used on
drivers/input/misc/apanel.c +3 -3
index 53ec40d1b90d..de0deb432fe3 100644
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
-#include <linux/input-polldev.h>
+#include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/leds.h>
 
@@ -51,19 +51,28 @@ static enum apanel_chip device_chip[APANEL_DEV_MAX];
 #define MAX_PANEL_KEYS 12
 
 struct apanel {
-       struct input_polled_dev *ipdev;
+       struct input_dev *idev;
        struct i2c_client *client;
        unsigned short keymap[MAX_PANEL_KEYS];
-       u16    nkeys;
+       u16 nkeys;
        struct led_classdev mail_led;
 };
 
Quoted 3 lines

drivers/input/misc/apanel.c static enum apanel_chip device_chip[APANEL_DEV_MAX]; · line 61

Quoted 1 line
drivers/input/misc/apanel.c +1 -0
+static unsigned short apanel_keymap[MAX_PANEL_KEYS] = {

Could this be const?

Yes, I believe so.

Quoted 192 lines
Quoted 178 lines
drivers/input/misc/apanel.c +37 -84
+       [0] = KEY_MAIL,
+       [1] = KEY_WWW,
+       [2] = KEY_PROG2,
+       [3] = KEY_PROG1,
 
-static int apanel_probe(struct i2c_client *, const struct i2c_device_id *);
+       [8] = KEY_FORWARD,
+       [9] = KEY_REWIND,
+       [10] = KEY_STOPCD,
+       [11] = KEY_PLAYPAUSE,
+};
 
 static void report_key(struct input_dev *input, unsigned keycode)
 {
-       pr_debug(APANEL ": report key %#x\n", keycode);
+       dev_dbg(input->dev.parent, "report key %#x\n", keycode);
        input_report_key(input, keycode, 1);
        input_sync(input);
 
@@ -79,10 +88,9 @@ static void report_key(struct input_dev *input, unsigned keycode)
  * CD keys:
  * Forward (0x100), Rewind (0x200), Stop (0x400), Pause (0x800)
  */
-static void apanel_poll(struct input_polled_dev *ipdev)
+static void apanel_poll(struct input_dev *idev)
 {
-       struct apanel *ap = ipdev->private;
-       struct input_dev *idev = ipdev->input;
+       struct apanel *ap = input_get_drvdata(idev);
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
        s32 data;
        int i;
@@ -112,126 +120,93 @@ static int mail_led_set(struct led_classdev *led,
        return i2c_smbus_write_word_data(ap->client, 0x10, led_bits);
 }
 
-static int apanel_remove(struct i2c_client *client)
-{
-       struct apanel *ap = i2c_get_clientdata(client);
-
-       if (device_chip[APANEL_DEV_LED] != CHIP_NONE)
-               led_classdev_unregister(&ap->mail_led);
-
-       input_unregister_polled_device(ap->ipdev);
-       input_free_polled_device(ap->ipdev);
-
-       return 0;
-}
-
-static void apanel_shutdown(struct i2c_client *client)
-{
-       apanel_remove(client);
-}
-
-static const struct i2c_device_id apanel_id[] = {
-       { "fujitsu_apanel", 0 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, apanel_id);
-
-static struct i2c_driver apanel_driver = {
-       .driver = {
-               .name = APANEL,
-       },
-       .probe          = &apanel_probe,
-       .remove         = &apanel_remove,
-       .shutdown       = &apanel_shutdown,
-       .id_table       = apanel_id,
-};
-
-static struct apanel apanel = {
-       .keymap = {
-               [0] = KEY_MAIL,
-               [1] = KEY_WWW,
-               [2] = KEY_PROG2,
-               [3] = KEY_PROG1,
-
-               [8] = KEY_FORWARD,
-               [9] = KEY_REWIND,
-               [10] = KEY_STOPCD,
-               [11] = KEY_PLAYPAUSE,
-
-       },
-       .mail_led = {
-               .name = "mail:blue",
-               .brightness_set_blocking = mail_led_set,
-       },
-};
-
-/* NB: Only one panel on the i2c. */
 static int apanel_probe(struct i2c_client *client,
                        const struct i2c_device_id *id)
 {
        struct apanel *ap;
-       struct input_polled_dev *ipdev;
        struct input_dev *idev;
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
-       int i, err = -ENOMEM;
+       int i, err;
 
-       ap = &apanel;
+       ap = devm_kzalloc(&client->dev, sizeof(*ap), GFP_KERNEL);
+       if (!ap)
+               return -ENOMEM;
 
-       ipdev = input_allocate_polled_device();
-       if (!ipdev)
-               goto out1;
+       idev = devm_input_allocate_device(&client->dev);
+       if (!idev)
+               return -ENOMEM;
 
-       ap->ipdev = ipdev;
+       ap->idev = idev;
        ap->client = client;
 
        i2c_set_clientdata(client, ap);
 
        err = i2c_smbus_write_word_data(client, cmd, 0);
        if (err) {
-               dev_warn(&client->dev, APANEL ": smbus write error %d\n",
-                        err);
-               goto out3;
+               dev_warn(&client->dev, "smbus write error %d\n", err);
+               return err;
        }
 
-       ipdev->poll = apanel_poll;
-       ipdev->poll_interval = POLL_INTERVAL_DEFAULT;
-       ipdev->private = ap;
+       input_set_drvdata(idev, ap);
 
-       idev = ipdev->input;
        idev->name = APANEL_NAME " buttons";
        idev->phys = "apanel/input0";
        idev->id.bustype = BUS_HOST;
-       idev->dev.parent = &client->dev;
-
-       set_bit(EV_KEY, idev->evbit);
 
+       memcpy(ap->keymap, apanel_keymap, sizeof(apanel_keymap));
        idev->keycode = ap->keymap;
        idev->keycodesize = sizeof(ap->keymap[0]);
        idev->keycodemax = (device_chip[APANEL_DEV_CDBTN] != CHIP_NONE) ? 12 : 4;
 
+       set_bit(EV_KEY, idev->evbit);
        for (i = 0; i < idev->keycodemax; i++)
                if (ap->keymap[i])
                        set_bit(ap->keymap[i], idev->keybit);
 
-       err = input_register_polled_device(ipdev);
+       err = input_setup_polling(idev, apanel_poll);
+       if (err)
+               return err;
+
+       input_set_poll_interval(idev, POLL_INTERVAL_DEFAULT);
+
+       err = input_register_device(idev);
        if (err)
-               goto out3;
+               return err;
 
        if (device_chip[APANEL_DEV_LED] != CHIP_NONE) {
-               err = led_classdev_register(&client->dev, &ap->mail_led);
+               ap->mail_led.name = "mail:blue";
+               ap->mail_led.brightness_set_blocking = mail_led_set;
+               err = devm_led_classdev_register(&client->dev, &ap->mail_led);
                if (err)
-                       goto out4;
+                       return err;
        }
 
        return 0;
-out4:
-       input_unregister_polled_device(ipdev);
-out3:
-       input_free_polled_device(ipdev);

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 192

Quoted 10 lines
drivers/input/misc/apanel.c +6 -2
-out1:
-       return err;
 }
 
+static void apanel_shutdown(struct i2c_client *client)
+{
+       struct apanel *ap = i2c_get_clientdata(client);
+
+       if (device_chip[APANEL_DEV_LED] != CHIP_NONE)
+               led_set_brightness(&ap->mail_led, LED_OFF);

Is this code required? Doesn't led_class_dev_unregister() (automatically called by devm_) switch the led off?

Quoted 2 lines

If it's not required, then the whole shutdown function can be removed.

No, it can't as it is not remove() but shutdown() method, the driver is not being unbound from the device, and devm teardown is not executed here.

Quoted 8 lines

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 196

Quoted 5 lines
drivers/input/misc/apanel.c +4 -0
+}
+
+static const struct i2c_device_id apanel_id[] = {
+       { "fujitsu_apanel", 0 },

If the driver_data field of i2c_device_id is unused, would it be better to match via apanel_driver.driver.of_match_table ?

This is X86 driver, and the device is instantiated from drivers/i2c/busses/i2c-i801.c based on DMI match, so using OF is not really helpful here.

Quoted 14 lines

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 206

Quoted 11 lines
drivers/input/misc/apanel.c +10 -0
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, apanel_id);
+
+static struct i2c_driver apanel_driver = {
+       .driver = {
+               .name = APANEL,
+       },
+       .probe          = &apanel_probe,
+       .shutdown       = &apanel_shutdown,

The ampersand (&) can be removed.
I realize that this is just old code that has changed position.

Yeah, I'll drop them.

Quoted 10 lines
Quoted 10 lines
drivers/input/misc/apanel.c +3 -1
+       .id_table       = apanel_id,
+};
+
 /* Scan the system ROM for the signature "FJKEYINF" */
 static __init const void __iomem *bios_signature(const void __iomem *bios)
 {
--

2.23.0.866.gb869b98d4c-goog

Thanks.

Signature · 1 line
Dmitry
#12 lore raw

Re: [PATCH 09/22] Input: apanel - switch to using polled mode of input devices

Quoted 11 lines · Dmitry Torokhov
Quoted 6 lines

drivers/input/misc/apanel.c static int mail_led_set(struct led_classdev *led, · line 196

Quoted 3 lines
drivers/input/misc/apanel.c +2 -0
+static const struct i2c_device_id apanel_id[] = {
+       { "fujitsu_apanel", 0 },

If the driver_data field of i2c_device_id is unused, would it be better to match via apanel_driver.driver.of_match_table ?

This is X86 driver, and the device is instantiated from drivers/i2c/busses/i2c-i801.c based on DMI match, so using OF is not really helpful here.

You're right of course! This driver doesn't even select/need CONFIG_OF :)

author maintainer
#13 lore raw

PATCH 10/22 Input: wistron_btns - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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.

---

 drivers/input/misc/Kconfig        |  1 -
 drivers/input/misc/wistron_btns.c | 51 ++++++++++++++++---------------
 2 files changed, 27 insertions(+), 25 deletions(-)
drivers/input/misc/Kconfig +0 -1
index a6b8af69915d..248e3b40bd24 100644
@@ -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
drivers/input/misc/wistron_btns.c +27 -24

126 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#14 lore raw

PATCH 11/22 Input: cobalt_btns - convert to use managed resources

In reply to Dmitry Torokhov

This simplifies error handling and allows to remove cobalt_buttons_remove() method.

---

 drivers/input/misc/cobalt_btns.c | 57 ++++++++++----------------------
 1 file changed, 17 insertions(+), 40 deletions(-)
drivers/input/misc/cobalt_btns.c +17 -40
index bcf6174bbd5d..f7c1693fc6bb 100644
@@ -5,6 +5,7 @@
  *  Copyright (C) 2007-2008  Yoichi Yuasa <[email protected]>
  */
 #include <linux/input-polldev.h>
+#include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -26,7 +27,6 @@ static const unsigned short cobalt_map[] = {
 };
 
 struct buttons_dev {
-	struct input_polled_dev *poll_dev;
 	unsigned short keymap[ARRAY_SIZE(cobalt_map)];
 	int count[ARRAY_SIZE(cobalt_map)];
 	void __iomem *reg;
@@ -67,15 +67,24 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
 	struct resource *res;
 	int error, i;
 
-	bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
-	poll_dev = input_allocate_polled_device();
-	if (!bdev || !poll_dev) {
-		error = -ENOMEM;
-		goto err_free_mem;
-	}
+	bdev = devm_kzalloc(&pdev->dev, sizeof(*bdev), GFP_KERNEL);
+	if (!bdev)
+		return -ENOMEM;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res)
+		return -EBUSY;
+
+	bdev->reg = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+	if (!bdev->reg)
+		return -ENOMEM;
 
 	memcpy(bdev->keymap, cobalt_map, sizeof(bdev->keymap));
 
+	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
+	if (!poll_dev)
+		return -ENOMEM;
+
 	poll_dev->private = bdev;
 	poll_dev->poll = handle_buttons;
 	poll_dev->poll_interval = BUTTONS_POLL_INTERVAL;
@@ -84,7 +93,6 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
 	input->name = "Cobalt buttons";
 	input->phys = "cobalt/input0";
 	input->id.bustype = BUS_HOST;
-	input->dev.parent = &pdev->dev;
 
 	input->keycode = bdev->keymap;
 	input->keycodemax = ARRAY_SIZE(bdev->keymap);
@@ -96,39 +104,9 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
 		__set_bit(bdev->keymap[i], input->keybit);
 	__clear_bit(KEY_RESERVED, input->keybit);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		error = -EBUSY;
-		goto err_free_mem;
-	}
-
-	bdev->poll_dev = poll_dev;
-	bdev->reg = ioremap(res->start, resource_size(res));
-	dev_set_drvdata(&pdev->dev, bdev);
-
 	error = input_register_polled_device(poll_dev);
 	if (error)
-		goto err_iounmap;
-
-	return 0;
-
- err_iounmap:
-	iounmap(bdev->reg);
- err_free_mem:
-	input_free_polled_device(poll_dev);
-	kfree(bdev);
-	return error;
-}
-
-static int cobalt_buttons_remove(struct platform_device *pdev)
-{
-	struct device *dev = &pdev->dev;
-	struct buttons_dev *bdev = dev_get_drvdata(dev);
-
-	input_unregister_polled_device(bdev->poll_dev);
-	input_free_polled_device(bdev->poll_dev);
-	iounmap(bdev->reg);
-	kfree(bdev);
+		return error;
 
 	return 0;
 }
@@ -141,7 +119,6 @@ MODULE_ALIAS("platform:Cobalt buttons");
 
 static struct platform_driver cobalt_buttons_driver = {
 	.probe	= cobalt_buttons_probe,
-	.remove	= cobalt_buttons_remove,
 	.driver	= {
 		.name	= "Cobalt buttons",
 	},
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#15 lore raw

PATCH 12/22 Input: cobalt_btns - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/misc/Kconfig       |  1 -
 drivers/input/misc/cobalt_btns.c | 26 ++++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 248e3b40bd24..05520bf4e31d 100644
@@ -326,7 +326,6 @@ config INPUT_IXP4XX_BEEPER
 config INPUT_COBALT_BTNS
 	tristate "Cobalt button interface"
 	depends on MIPS_COBALT
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you want to support MIPS Cobalt button interface.
 
drivers/input/misc/cobalt_btns.c +14 -12
index f7c1693fc6bb..b1624f5414ee 100644
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2007-2008  Yoichi Yuasa <[email protected]>
  */
-#include <linux/input-polldev.h>
+#include <linux/input.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
@@ -32,10 +32,9 @@ struct buttons_dev {
 	void __iomem *reg;
 };
 
-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);
 	uint32_t status;
 	int i;
 
@@ -62,7 +61,6 @@ static void handle_buttons(struct input_polled_dev *dev)
 static int cobalt_buttons_probe(struct platform_device *pdev)
 {
 	struct buttons_dev *bdev;
-	struct input_polled_dev *poll_dev;
 	struct input_dev *input;
 	struct resource *res;
 	int error, i;
@@ -81,15 +79,12 @@ static int cobalt_buttons_probe(struct platform_device *pdev)
 
 	memcpy(bdev->keymap, cobalt_map, sizeof(bdev->keymap));
 
-	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->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 = "Cobalt buttons";
 	input->phys = "cobalt/input0";
 	input->id.bustype = BUS_HOST;
@@ -104,7 +99,14 @@ static int cobalt_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;
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#16 lore raw

PATCH 13/22 Input: sgi_btns - switch to using managed resources

In reply to Dmitry Torokhov

Switching to devm API allows to clean up error handling paths and drop the remove() method.

---

 drivers/input/misc/sgi_btns.c | 37 ++++++++---------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)
drivers/input/misc/sgi_btns.c +8 -29
index 0fee6ddf3602..829277b4271f 100644
@@ -45,7 +45,6 @@ static const unsigned short sgi_map[] = {
 };
 
 struct buttons_dev {
-	struct input_polled_dev *poll_dev;
 	unsigned short keymap[ARRAY_SIZE(sgi_map)];
 	int count[ARRAY_SIZE(sgi_map)];
 };
@@ -84,12 +83,13 @@ static int sgi_buttons_probe(struct platform_device *pdev)
 	struct input_dev *input;
 	int error, i;
 
-	bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
-	poll_dev = input_allocate_polled_device();
-	if (!bdev || !poll_dev) {
-		error = -ENOMEM;
-		goto err_free_mem;
-	}
+	bdev = devm_kzalloc(&pdev->dev, sizeof(*bdev), GFP_KERNEL);
+	if (!bdev)
+		return -ENOMEM;
+
+	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
+	if (!poll_dev)
+		return -ENOMEM;
 
 	memcpy(bdev->keymap, sgi_map, sizeof(bdev->keymap));
 
@@ -101,7 +101,6 @@ static int sgi_buttons_probe(struct platform_device *pdev)
 	input->name = "SGI buttons";
 	input->phys = "sgi/input0";
 	input->id.bustype = BUS_HOST;
-	input->dev.parent = &pdev->dev;
 
 	input->keycode = bdev->keymap;
 	input->keycodemax = ARRAY_SIZE(bdev->keymap);
@@ -113,35 +112,15 @@ static int sgi_buttons_probe(struct platform_device *pdev)
 		__set_bit(bdev->keymap[i], input->keybit);
 	__clear_bit(KEY_RESERVED, input->keybit);
 
-	bdev->poll_dev = poll_dev;
-	platform_set_drvdata(pdev, bdev);
-
 	error = input_register_polled_device(poll_dev);
 	if (error)
-		goto err_free_mem;
-
-	return 0;
-
- err_free_mem:
-	input_free_polled_device(poll_dev);
-	kfree(bdev);
-	return error;
-}
-
-static int sgi_buttons_remove(struct platform_device *pdev)
-{
-	struct buttons_dev *bdev = platform_get_drvdata(pdev);
-
-	input_unregister_polled_device(bdev->poll_dev);
-	input_free_polled_device(bdev->poll_dev);
-	kfree(bdev);
+		return error;
 
 	return 0;
 }
 
 static struct platform_driver sgi_buttons_driver = {
 	.probe	= sgi_buttons_probe,
-	.remove	= sgi_buttons_remove,
 	.driver	= {
 		.name	= "sgibtns",
 	},
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#17 lore raw

PATCH 14/22 Input: sgi_btns - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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.

---

 drivers/input/misc/Kconfig    |  1 -
 drivers/input/misc/sgi_btns.c | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 05520bf4e31d..c27a9ee4ef9a 100644
@@ -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.
 
drivers/input/misc/sgi_btns.c +13 -12
index 829277b4271f..0657d785b3cc 100644
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2008  Thomas Bogendoerfer <[email protected]>
  */
-#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;
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#18 lore raw

PATCH 15/22 Input: rb532_button - switch to using managed resources

In reply to Dmitry Torokhov

Using devm API allows us to clean up error handling paths and drop the remove() method.

---

 drivers/input/misc/rb532_button.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
drivers/input/misc/rb532_button.c +2 -18
index 4412055f8761..3c43024f4527 100644
@@ -58,7 +58,7 @@ static int rb532_button_probe(struct platform_device *pdev)
 	struct input_polled_dev *poll_dev;
 	int error;
 
-	poll_dev = input_allocate_polled_device();
+	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
 	if (!poll_dev)
 		return -ENOMEM;
 
@@ -68,34 +68,18 @@ static int rb532_button_probe(struct platform_device *pdev)
 	poll_dev->input->name = "rb532 button";
 	poll_dev->input->phys = "rb532/button0";
 	poll_dev->input->id.bustype = BUS_HOST;
-	poll_dev->input->dev.parent = &pdev->dev;
-
-	dev_set_drvdata(&pdev->dev, poll_dev);
 
 	input_set_capability(poll_dev->input, EV_KEY, RB532_BTN_KSYM);
 
 	error = input_register_polled_device(poll_dev);
-	if (error) {
-		input_free_polled_device(poll_dev);
+	if (error)
 		return error;
-	}
-
-	return 0;
-}
-
-static int rb532_button_remove(struct platform_device *pdev)
-{
-	struct input_polled_dev *poll_dev = dev_get_drvdata(&pdev->dev);
-
-	input_unregister_polled_device(poll_dev);
-	input_free_polled_device(poll_dev);
 
 	return 0;
 }
 
 static struct platform_driver rb532_button_driver = {
 	.probe = rb532_button_probe,
-	.remove = rb532_button_remove,
 	.driver = {
 		.name = DRV_NAME,
 	},
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#19 lore raw

PATCH 16/22 Input: rb532_button - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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.

---

 drivers/input/misc/Kconfig        |  1 -
 drivers/input/misc/rb532_button.c | 32 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)
drivers/input/misc/Kconfig +0 -1
index c27a9ee4ef9a..102e993bbd6b 100644
@@ -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.
drivers/input/misc/rb532_button.c +17 -15
index 3c43024f4527..190a80e1e2c1 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2009  Phil Sutter <[email protected]>
  */
 
-#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;
+
+	input_set_poll_interval(input, RB532_BTN_RATE);
 
-	error = input_register_polled_device(poll_dev);
+	error = input_register_device(input);
 	if (error)
 		return error;
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#20 lore raw

PATCH 17/22 Input: gpio_decoder - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/misc/Kconfig        |  1 -
 drivers/input/misc/gpio_decoder.c | 42 +++++++++++++++++--------------
 2 files changed, 23 insertions(+), 20 deletions(-)
drivers/input/misc/Kconfig +0 -1
index 102e993bbd6b..b108c992bb7a 100644
@@ -290,7 +290,6 @@ config INPUT_GPIO_BEEPER
 config INPUT_GPIO_DECODER
 	tristate "Polled GPIO Decoder Input driver"
 	depends on GPIOLIB || COMPILE_TEST
-	select INPUT_POLLDEV
 	help
 	 Say Y here if you want driver to read status of multiple GPIO
 	 lines and report the encoded value as an absolute integer to
drivers/input/misc/gpio_decoder.c +23 -19

94 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#21 lore raw

PATCH 18/22 Input: mma8450 - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/misc/Kconfig   |   1 -
 drivers/input/misc/mma8450.c | 101 ++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 56 deletions(-)
drivers/input/misc/Kconfig +0 -1
index b108c992bb7a..e1309cb190e1 100644
@@ -246,7 +246,6 @@ config INPUT_MC13783_PWRBUTTON
 config INPUT_MMA8450
 	tristate "MMA8450 - Freescale's 3-Axis, 8/12-bit Digital Accelerometer"
 	depends on I2C
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you want to support Freescale's MMA8450 Accelerometer
 	  through I2C interface.
drivers/input/misc/mma8450.c +46 -55

187 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#22 lore raw

PATCH 19/22 Input: bma150 - use managed resources helpers

In reply to Dmitry Torokhov

From: Jonathan Bakker <[email protected]>

The driver can be cleaned up by using managed resource helpers.

Patchwork-Id: 10794333

[dtor: do not explicitly set parent of input device since we are using devm]

---

 drivers/input/misc/bma150.c | 51 ++++++++++---------------------------
 1 file changed, 14 insertions(+), 37 deletions(-)
drivers/input/misc/bma150.c +14 -37
index 735d3a46f44b..d65b008a3c7a 100644
@@ -439,13 +439,11 @@ static int bma150_initialize(struct bma150_data *bma150,
 	return bma150_set_mode(bma150, BMA150_MODE_SLEEP);
 }
 
-static void bma150_init_input_device(struct bma150_data *bma150,
-						struct input_dev *idev)
+static void bma150_init_input_device(struct input_dev *idev)
 {
 	idev->name = BMA150_DRIVER;
 	idev->phys = BMA150_DRIVER "/input0";
 	idev->id.bustype = BUS_I2C;
-	idev->dev.parent = &bma150->client->dev;
 
 	idev->evbit[0] = BIT_MASK(EV_ABS);
 	input_set_abs_params(idev, ABS_X, ABSMIN_ACC_VAL, ABSMAX_ACC_VAL, 0, 0);
@@ -458,11 +456,11 @@ static int bma150_register_input_device(struct bma150_data *bma150)
 	struct input_dev *idev;
 	int error;
 
-	idev = input_allocate_device();
+	idev = devm_input_allocate_device(&bma150->client->dev);
 	if (!idev)
 		return -ENOMEM;
 
-	bma150_init_input_device(bma150, idev);
+	bma150_init_input_device(idev);
 
 	idev->open = bma150_irq_open;
 	idev->close = bma150_irq_close;
@@ -471,10 +469,8 @@ static int bma150_register_input_device(struct bma150_data *bma150)
 	bma150->input = idev;
 
 	error = input_register_device(idev);
-	if (error) {
-		input_free_device(idev);
+	if (error)
 		return error;
-	}
 
 	return 0;
 }
@@ -484,7 +480,7 @@ static int bma150_register_polled_device(struct bma150_data *bma150)
 	struct input_polled_dev *ipoll_dev;
 	int error;
 
-	ipoll_dev = input_allocate_polled_device();
+	ipoll_dev = devm_input_allocate_polled_device(&bma150->client->dev);
 	if (!ipoll_dev)
 		return -ENOMEM;
 
@@ -496,16 +492,14 @@ static int bma150_register_polled_device(struct bma150_data *bma150)
 	ipoll_dev->poll_interval_min = BMA150_POLL_MIN;
 	ipoll_dev->poll_interval_max = BMA150_POLL_MAX;
 
-	bma150_init_input_device(bma150, ipoll_dev->input);
+	bma150_init_input_device(ipoll_dev->input);
 
 	bma150->input_polled = ipoll_dev;
 	bma150->input = ipoll_dev->input;
 
 	error = input_register_polled_device(ipoll_dev);
-	if (error) {
-		input_free_polled_device(ipoll_dev);
+	if (error)
 		return error;
-	}
 
 	return 0;
 }
@@ -531,7 +525,7 @@ static int bma150_probe(struct i2c_client *client,
 		return -EINVAL;
 	}
 
-	bma150 = kzalloc(sizeof(struct bma150_data), GFP_KERNEL);
+	bma150 = devm_kzalloc(&client->dev, sizeof(*bma150), GFP_KERNEL);
 	if (!bma150)
 		return -ENOMEM;
 
@@ -544,7 +538,7 @@ static int bma150_probe(struct i2c_client *client,
 				dev_err(&client->dev,
 					"IRQ GPIO conf. error %d, error %d\n",
 					client->irq, error);
-				goto err_free_mem;
+				return error;
 			}
 		}
 		cfg = &pdata->cfg;
@@ -554,14 +548,14 @@ static int bma150_probe(struct i2c_client *client,
 
 	error = bma150_initialize(bma150, cfg);
 	if (error)
-		goto err_free_mem;
+		return error;
 
 	if (client->irq > 0) {
 		error = bma150_register_input_device(bma150);
 		if (error)
-			goto err_free_mem;
+			return error;
 
-		error = request_threaded_irq(client->irq,
+		error = devm_request_threaded_irq(&client->dev, client->irq,
 					NULL, bma150_irq_thread,
 					IRQF_TRIGGER_RISING | IRQF_ONESHOT,
 					BMA150_DRIVER, bma150);
@@ -569,13 +563,12 @@ static int bma150_probe(struct i2c_client *client,
 			dev_err(&client->dev,
 				"irq request failed %d, error %d\n",
 				client->irq, error);
-			input_unregister_device(bma150->input);
-			goto err_free_mem;
+			return error;
 		}
 	} else {
 		error = bma150_register_polled_device(bma150);
 		if (error)
-			goto err_free_mem;
+			return error;
 	}
 
 	i2c_set_clientdata(client, bma150);
@@ -583,28 +576,12 @@ static int bma150_probe(struct i2c_client *client,
 	pm_runtime_enable(&client->dev);
 
 	return 0;
-
-err_free_mem:
-	kfree(bma150);
-	return error;
 }
 
 static int bma150_remove(struct i2c_client *client)
 {
-	struct bma150_data *bma150 = i2c_get_clientdata(client);
-
 	pm_runtime_disable(&client->dev);
 
-	if (client->irq > 0) {
-		free_irq(client->irq, bma150);
-		input_unregister_device(bma150->input);
-	} else {
-		input_unregister_polled_device(bma150->input_polled);
-		input_free_polled_device(bma150->input_polled);
-	}
-
-	kfree(bma150);
-
 	return 0;
 }
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#23 lore raw

PATCH 20/22 Input: bma150 - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

---

 drivers/input/misc/Kconfig  |   1 -
 drivers/input/misc/bma150.c | 155 ++++++++++--------------------------
 2 files changed, 44 insertions(+), 112 deletions(-)
drivers/input/misc/Kconfig +0 -1
index e1309cb190e1..438ec07e3b62 100644
@@ -100,7 +100,6 @@ config INPUT_ATMEL_CAPTOUCH
 config INPUT_BMA150
 	tristate "BMA150/SMB380 acceleration sensor support"
 	depends on I2C
-	select INPUT_POLLDEV
 	help
 	  Say Y here if you have Bosch Sensortec's BMA150 or SMB380
 	  acceleration sensor hooked to an I2C bus.
drivers/input/misc/bma150.c +44 -111

236 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#24 lore raw

PATCH 21/22 Input: kxtj9 - switch to using managed resources

In reply to Dmitry Torokhov

Using devm API allows to clean up error handling and drop the remove() method.

---

 drivers/input/misc/kxtj9.c | 86 +++++++++++++-------------------------
 1 file changed, 28 insertions(+), 58 deletions(-)
drivers/input/misc/kxtj9.c +28 -58
index db01c4a33914..a86544d575f8 100644
@@ -292,7 +292,6 @@ static void kxtj9_init_input_device(struct kxtj9_data *tj9,
 
 	input_dev->name = "kxtj9_accel";
 	input_dev->id.bustype = BUS_I2C;
-	input_dev->dev.parent = &tj9->client->dev;
 }
 
 static int kxtj9_setup_input_device(struct kxtj9_data *tj9)
@@ -300,7 +299,7 @@ static int kxtj9_setup_input_device(struct kxtj9_data *tj9)
 	struct input_dev *input_dev;
 	int err;
 
-	input_dev = input_allocate_device();
+	input_dev = devm_input_allocate_device(&tj9->client->dev);
 	if (!input_dev) {
 		dev_err(&tj9->client->dev, "input device allocate failed\n");
 		return -ENOMEM;
@@ -319,7 +318,6 @@ static int kxtj9_setup_input_device(struct kxtj9_data *tj9)
 		dev_err(&tj9->client->dev,
 			"unable to register input polled device %s: %d\n",
 			tj9->input_dev->name, err);
-		input_free_device(tj9->input_dev);
 		return err;
 	}
 
@@ -424,8 +422,8 @@ static int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
 {
 	int err;
 	struct input_polled_dev *poll_dev;
-	poll_dev = input_allocate_polled_device();
 
+	poll_dev = devm_input_allocate_polled_device(&tj9->client->dev);
 	if (!poll_dev) {
 		dev_err(&tj9->client->dev,
 			"Failed to allocate polled device\n");
@@ -446,19 +444,12 @@ static int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
 	if (err) {
 		dev_err(&tj9->client->dev,
 			"Unable to register polled device, err=%d\n", err);
-		input_free_polled_device(poll_dev);
 		return err;
 	}
 
 	return 0;
 }
 
-static void kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
-{
-	input_unregister_polled_device(tj9->poll_dev);
-	input_free_polled_device(tj9->poll_dev);
-}
-
 #else
 
 static inline int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
@@ -466,11 +457,15 @@ static inline int kxtj9_setup_polled_device(struct kxtj9_data *tj9)
 	return -ENOSYS;
 }
 
-static inline void kxtj9_teardown_polled_device(struct kxtj9_data *tj9)
+#endif
+
+static void kxtj9_platform_exit(void *data)
 {
-}
+	struct kxtj9_data *tj9 = data;
 
-#endif
+	if (tj9->pdata.exit)
+		tj9->pdata.exit();
+}
 
 static int kxtj9_verify(struct kxtj9_data *tj9)
 {
@@ -494,7 +489,7 @@ static int kxtj9_verify(struct kxtj9_data *tj9)
 }
 
 static int kxtj9_probe(struct i2c_client *client,
-				 const struct i2c_device_id *id)
+		       const struct i2c_device_id *id)
 {
 	const struct kxtj9_platform_data *pdata =
 			dev_get_platdata(&client->dev);
@@ -512,7 +507,7 @@ static int kxtj9_probe(struct i2c_client *client,
 		return -EINVAL;
 	}
 
-	tj9 = kzalloc(sizeof(*tj9), GFP_KERNEL);
+	tj9 = devm_kzalloc(&client->dev, sizeof(*tj9), GFP_KERNEL);
 	if (!tj9) {
 		dev_err(&client->dev,
 			"failed to allocate memory for module data\n");
@@ -525,13 +520,17 @@ static int kxtj9_probe(struct i2c_client *client,
 	if (pdata->init) {
 		err = pdata->init();
 		if (err < 0)
-			goto err_free_mem;
+			return err;
 	}
 
+	err = devm_add_action_or_reset(&client->dev, kxtj9_platform_exit, tj9);
+	if (err)
+		return err;
+
 	err = kxtj9_verify(tj9);
 	if (err < 0) {
 		dev_err(&client->dev, "device not recognized\n");
-		goto err_pdata_exit;
+		return err;
 	}
 
 	i2c_set_clientdata(client, tj9);
@@ -546,59 +545,31 @@ static int kxtj9_probe(struct i2c_client *client,
 
 		err = kxtj9_setup_input_device(tj9);
 		if (err)
-			goto err_pdata_exit;
+			return err;
 
-		err = request_threaded_irq(client->irq, NULL, kxtj9_isr,
-					   IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-					   "kxtj9-irq", tj9);
+		err = devm_request_threaded_irq(&client->dev, client->irq,
+						NULL, kxtj9_isr,
+						IRQF_TRIGGER_RISING |
+							IRQF_ONESHOT,
+						"kxtj9-irq", tj9);
 		if (err) {
 			dev_err(&client->dev, "request irq failed: %d\n", err);
-			goto err_destroy_input;
+			return err;
 		}
 
-		err = sysfs_create_group(&client->dev.kobj, &kxtj9_attribute_group);
+		err = devm_device_add_group(&client->dev,
+					    &kxtj9_attribute_group);
 		if (err) {
 			dev_err(&client->dev, "sysfs create failed: %d\n", err);
-			goto err_free_irq;
+			return err;
 		}
 
 	} else {
 		err = kxtj9_setup_polled_device(tj9);
 		if (err)
-			goto err_pdata_exit;
-	}
-
-	return 0;
-
-err_free_irq:
-	free_irq(client->irq, tj9);
-err_destroy_input:
-	input_unregister_device(tj9->input_dev);
-err_pdata_exit:
-	if (tj9->pdata.exit)
-		tj9->pdata.exit();
-err_free_mem:
-	kfree(tj9);
-	return err;
-}
-
-static int kxtj9_remove(struct i2c_client *client)
-{
-	struct kxtj9_data *tj9 = i2c_get_clientdata(client);
-
-	if (client->irq) {
-		sysfs_remove_group(&client->dev.kobj, &kxtj9_attribute_group);
-		free_irq(client->irq, tj9);
-		input_unregister_device(tj9->input_dev);
-	} else {
-		kxtj9_teardown_polled_device(tj9);
+			return err;
 	}
 
-	if (tj9->pdata.exit)
-		tj9->pdata.exit();
-
-	kfree(tj9);
-
 	return 0;
 }
 
@@ -647,7 +618,6 @@ static struct i2c_driver kxtj9_driver = {
 		.pm	= &kxtj9_pm_ops,
 	},
 	.probe		= kxtj9_probe,
-	.remove		= kxtj9_remove,
 	.id_table	= kxtj9_id,
 };
 
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
author maintainer
#25 lore raw

PATCH 22/22 Input: kxtj9 - switch to using polled mode of input devices

In reply to Dmitry Torokhov

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

note that with regular input devices handling polling, there is no longer a benefit in having separate INPUT_KXTJ9_POLLED_MODE config option.

---

 drivers/input/misc/Kconfig |   7 --
 drivers/input/misc/kxtj9.c | 152 +++++++++----------------------------
 2 files changed, 37 insertions(+), 122 deletions(-)
drivers/input/misc/Kconfig +0 -7
index 438ec07e3b62..7e2e658d551c 100644
@@ -404,13 +404,6 @@ config INPUT_KXTJ9
 	  To compile this driver as a module, choose M here: the module will
 	  be called kxtj9.
 
-config INPUT_KXTJ9_POLLED_MODE
-	bool "Enable polling mode support"
-	depends on INPUT_KXTJ9
-	select INPUT_POLLDEV
-	help
-	  Say Y here if you need accelerometer to work in polling mode.
-
 config INPUT_POWERMATE
 	tristate "Griffin PowerMate and Contour Jog support"
 	depends on USB_ARCH_HAS_HCD
drivers/input/misc/kxtj9.c +37 -115

206 lines not on this page · raw message

Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Acked-by on the v1 series
#26 lore raw
In reply to Dmitry Torokhov
Quoted 4 lines · Dmitry Torokhov

Input devices now support polling mode natively (via input_setup_polling API), and input_polled_dev implementation is going away. This series switches drivers found in drivers/input to the new scheme.

For all I have been Cc'ed

Quoted 52 lines

Dmitry Torokhov (21):
Input: raspberrypi-ts - switch to using polled mode of input devices
Input: sur40 - switch to using polled mode of input devices
Input: ts4800-ts - switch to using polled mode of input devices
Input: tsc6507x-ts - switch to using polled mode of input devices
Input: adc-keys - switch to using polled mode of input devices
Input: clps711x-keypad - switch to using polled mode of input devices
Input: jornada680_kbd - switch to using polled mode of input devices
Input: gpio_keys_polled - switch to using polled mode of input devices
Input: apanel - switch to using polled mode of input devices
Input: wistron_btns - switch to using polled mode of input devices
Input: cobalt_btns - convert to use managed resources
Input: cobalt_btns - switch to using polled mode of input devices
Input: sgi_btns - switch to using managed resources
Input: sgi_btns - switch to using polled mode of input devices
Input: rb532_button - switch to using managed resources
Input: rb532_button - switch to using polled mode of input devices
Input: gpio_decoder - switch to using polled mode of input devices
Input: mma8450 - switch to using polled mode of input devices
Input: bma150 - switch to using polled mode of input devices
Input: kxtj9 - switch to using managed resources
Input: kxtj9 - switch to using polled mode of input devices

Jonathan Bakker (1):
Input: bma150 - use managed resources helpers

 drivers/input/keyboard/Kconfig             |   4 -
 drivers/input/keyboard/adc-keys.c          |  36 ++--
 drivers/input/keyboard/clps711x-keypad.c   |  70 +++----
 drivers/input/keyboard/gpio_keys_polled.c  |  65 +++---
 drivers/input/keyboard/jornada680_kbd.c    |  37 ++--
 drivers/input/misc/Kconfig                 |  15 --
 drivers/input/misc/apanel.c                | 153 ++++++--------
 drivers/input/misc/bma150.c                | 190 +++++------------
 drivers/input/misc/cobalt_btns.c           |  73 +++----
 drivers/input/misc/gpio_decoder.c          |  42 ++--
 drivers/input/misc/kxtj9.c                 | 224 ++++++---------------
 drivers/input/misc/mma8450.c               | 101 +++++-----
 drivers/input/misc/rb532_button.c          |  48 ++---
 drivers/input/misc/sgi_btns.c              |  54 ++---
 drivers/input/misc/wistron_btns.c          |  51 ++---
 drivers/input/touchscreen/Kconfig          |   4 -
 drivers/input/touchscreen/raspberrypi-ts.c |  38 ++--
 drivers/input/touchscreen/sur40.c          |  92 +++++----
 drivers/input/touchscreen/tps6507x-ts.c    |  36 ++--
 drivers/input/touchscreen/ts4800-ts.c      |  68 ++++---
 20 files changed, 557 insertions(+), 844 deletions(-)
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Acked-by
#27 lore raw
Quoted 8 lines · Andy Shevchenko
Quoted 4 lines · Dmitry Torokhov

Input devices now support polling mode natively (via input_setup_polling API), and input_polled_dev implementation is going away. This series switches drivers found in drivers/input to the new scheme.

For all I have been Cc'ed

Same for me

Quoted 59 lines
Quoted 52 lines

Dmitry Torokhov (21):
Input: raspberrypi-ts - switch to using polled mode of input devices
Input: sur40 - switch to using polled mode of input devices
Input: ts4800-ts - switch to using polled mode of input devices
Input: tsc6507x-ts - switch to using polled mode of input devices
Input: adc-keys - switch to using polled mode of input devices
Input: clps711x-keypad - switch to using polled mode of input devices
Input: jornada680_kbd - switch to using polled mode of input devices
Input: gpio_keys_polled - switch to using polled mode of input devices
Input: apanel - switch to using polled mode of input devices
Input: wistron_btns - switch to using polled mode of input devices
Input: cobalt_btns - convert to use managed resources
Input: cobalt_btns - switch to using polled mode of input devices
Input: sgi_btns - switch to using managed resources
Input: sgi_btns - switch to using polled mode of input devices
Input: rb532_button - switch to using managed resources
Input: rb532_button - switch to using polled mode of input devices
Input: gpio_decoder - switch to using polled mode of input devices
Input: mma8450 - switch to using polled mode of input devices
Input: bma150 - switch to using polled mode of input devices
Input: kxtj9 - switch to using managed resources
Input: kxtj9 - switch to using polled mode of input devices

Jonathan Bakker (1):
Input: bma150 - use managed resources helpers

 drivers/input/keyboard/Kconfig             |   4 -
 drivers/input/keyboard/adc-keys.c          |  36 ++--
 drivers/input/keyboard/clps711x-keypad.c   |  70 +++----
 drivers/input/keyboard/gpio_keys_polled.c  |  65 +++---
 drivers/input/keyboard/jornada680_kbd.c    |  37 ++--
 drivers/input/misc/Kconfig                 |  15 --
 drivers/input/misc/apanel.c                | 153 ++++++--------
 drivers/input/misc/bma150.c                | 190 +++++------------
 drivers/input/misc/cobalt_btns.c           |  73 +++----
 drivers/input/misc/gpio_decoder.c          |  42 ++--
 drivers/input/misc/kxtj9.c                 | 224 ++++++---------------
 drivers/input/misc/mma8450.c               | 101 +++++-----
 drivers/input/misc/rb532_button.c          |  48 ++---
 drivers/input/misc/sgi_btns.c              |  54 ++---
 drivers/input/misc/wistron_btns.c          |  51 ++---
 drivers/input/touchscreen/Kconfig          |   4 -
 drivers/input/touchscreen/raspberrypi-ts.c |  38 ++--
 drivers/input/touchscreen/sur40.c          |  92 +++++----
 drivers/input/touchscreen/tps6507x-ts.c    |  36 ++--
 drivers/input/touchscreen/ts4800-ts.c      |  68 ++++---
 20 files changed, 557 insertions(+), 844 deletions(-)
Signature · 1 line
2.23.0.866.gb869b98d4c-goog
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |