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: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Родитель
0f78ba96bb
Коммит
ea6aabf877
|
@ -34,7 +34,6 @@ struct gpio_keys_button_data {
|
||||||
int last_state;
|
int last_state;
|
||||||
int count;
|
int count;
|
||||||
int threshold;
|
int threshold;
|
||||||
int can_sleep;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct gpio_keys_polled_dev {
|
struct gpio_keys_polled_dev {
|
||||||
|
@ -76,17 +75,18 @@ static void gpio_keys_polled_check_state(struct input_polled_dev *dev,
|
||||||
{
|
{
|
||||||
int state;
|
int state;
|
||||||
|
|
||||||
if (bdata->can_sleep)
|
state = gpiod_get_value_cansleep(bdata->gpiod);
|
||||||
state = !!gpiod_get_value_cansleep(bdata->gpiod);
|
if (state < 0) {
|
||||||
else
|
dev_err(dev->input->dev.parent,
|
||||||
state = !!gpiod_get_value(bdata->gpiod);
|
"failed to get gpio state: %d\n", state);
|
||||||
|
} else {
|
||||||
gpio_keys_button_event(dev, button, state);
|
gpio_keys_button_event(dev, button, state);
|
||||||
|
|
||||||
if (state != bdata->last_state) {
|
if (state != bdata->last_state) {
|
||||||
bdata->count = 0;
|
bdata->count = 0;
|
||||||
bdata->last_state = state;
|
bdata->last_state = state;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gpio_keys_polled_poll(struct input_polled_dev *dev)
|
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->last_state = -1;
|
||||||
bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
|
bdata->threshold = DIV_ROUND_UP(button->debounce_interval,
|
||||||
pdata->poll_interval);
|
pdata->poll_interval);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче