Input: gpio_mouse - switch to using input device polling mode (3df955f8) · Commits · 戴 / test

drivers/input/mouse/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ config MOUSE_VSXXXAA
		config MOUSE_GPIO
		tristate "GPIO mouse"
		depends on GPIOLIB \|\| COMPILE_TEST
		select INPUT_POLLDEV
		help
		This driver simulates a mouse on GPIO lines of various CPUs (and some
		other chips).

drivers/input/mouse/gpio_mouse.c

+20 −25

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@

		#include <linux/module.h>
		#include <linux/platform_device.h>
		#include <linux/input-polldev.h>
		#include <linux/input.h>
		#include <linux/gpio/consumer.h>
		#include <linux/property.h>
		#include <linux/of.h>
		@@ -43,10 +43,9 @@ struct gpio_mouse {
		* Timer function which is run every scan_ms ms when the device is opened.
		* The dev input variable is set to the the input_dev pointer.
		*/
		static void gpio_mouse_scan(struct input_polled_dev *dev)
		static void gpio_mouse_scan(struct input_dev *input)
		{
		struct gpio_mouse *gpio = dev->private;
		struct input_dev *input = dev->input;
		struct gpio_mouse *gpio = input_get_drvdata(input);
		int x, y;

		if (gpio->bleft)
		@@ -71,18 +70,17 @@ static int gpio_mouse_probe(struct platform_device *pdev)
		{
		struct device *dev = &pdev->dev;
		struct gpio_mouse *gmouse;
		struct input_polled_dev *input_poll;
		struct input_dev *input;
		int ret;
		int error;

		gmouse = devm_kzalloc(dev, sizeof(*gmouse), GFP_KERNEL);
		if (!gmouse)
		return -ENOMEM;

		/* Assign some default scanning time */
		ret = device_property_read_u32(dev, "scan-interval-ms",
		error = device_property_read_u32(dev, "scan-interval-ms",
		&gmouse->scan_ms);
		if (ret \|\| gmouse->scan_ms == 0) {
		if (error \|\| gmouse->scan_ms == 0) {
		dev_warn(dev, "invalid scan time, set to 50 ms\n");
		gmouse->scan_ms = 50;
		}
		@@ -112,23 +110,14 @@ static int gpio_mouse_probe(struct platform_device *pdev)
		if (IS_ERR(gmouse->bright))
		return PTR_ERR(gmouse->bright);

		input_poll = devm_input_allocate_polled_device(dev);
		if (!input_poll) {
		dev_err(dev, "not enough memory for input device\n");
		input = devm_input_allocate_device(dev);
		if (!input)
		return -ENOMEM;
		}

		platform_set_drvdata(pdev, input_poll);

		/* set input-polldev handlers */
		input_poll->private = gmouse;
		input_poll->poll = gpio_mouse_scan;
		input_poll->poll_interval = gmouse->scan_ms;

		input = input_poll->input;
		input->name = pdev->name;
		input->id.bustype = BUS_HOST;
		input->dev.parent = &pdev->dev;

		input_set_drvdata(input, gmouse);

		input_set_capability(input, EV_REL, REL_X);
		input_set_capability(input, EV_REL, REL_Y);
		@@ -139,10 +128,16 @@ static int gpio_mouse_probe(struct platform_device *pdev)
		if (gmouse->bright)
		input_set_capability(input, EV_KEY, BTN_RIGHT);

		ret = input_register_polled_device(input_poll);
		if (ret) {
		error = input_setup_polling(input, gpio_mouse_scan);
		if (error)
		return error;

		input_set_poll_interval(input, gmouse->scan_ms);

		error = input_register_device(input);
		if (error) {
		dev_err(dev, "could not register input device\n");
		return ret;
		return error;
		}

		dev_dbg(dev, "%d ms scan time, buttons: %s%s%s\n",

Admin message