Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6aabf8 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: gpio_keys_polled - always use gpiod_get_value_cansleep 



It does not matter if given GPIO may sleep or not when reading state,
polling is always done in a non-atomic context, so we should always
be able to simply use gpiod_get_value_cansleep().

Also let's note in the logs when we fail to read gpio state.

Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 0f78ba96

drivers/input/keyboard/gpio_keys_polled.c

+10 −11
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct gpio_keys_button_data { 
	int last_state;

	int count;

	int threshold;

	int can_sleep;

};



struct gpio_keys_polled_dev {
@@ -76,11 +75,11 @@ static void gpio_keys_polled_check_state(struct input_polled_dev *dev, 
{

	int state;



	if (bdata->can_sleep)

		state = !!gpiod_get_value_cansleep(bdata->gpiod);

	else

		state = !!gpiod_get_value(bdata->gpiod);



	state = gpiod_get_value_cansleep(bdata->gpiod);

	if (state < 0) {

		dev_err(dev->input->dev.parent,

			"failed to get gpio state: %d\n", state);

	} else {

		gpio_keys_button_event(dev, button, state);



		if (state != bdata->last_state) {
@@ -88,6 +87,7 @@ static void gpio_keys_polled_check_state(struct input_polled_dev *dev, 
			bdata->last_state = state;

		}

	}

}



static void gpio_keys_polled_poll(struct input_polled_dev *dev)

{
@@ -342,7 +342,6 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 
			}

		}



		bdata->can_sleep = gpiod_cansleep(bdata->gpiod);

		bdata->last_state = -1;

		bdata->threshold = DIV_ROUND_UP(button->debounce_interval,

						pdata->poll_interval);