diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-29 12:24:08 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-12-04 00:25:11 -0500 |
commit | da5ee074ce8e07b9a91596de3576b59990c0c8c6 (patch) | |
tree | adbe068e9e42f1b57b1c9962173a6219c6985dff | |
parent | 333e34bfe2149e634fb0613b4936fd838c36fafb (diff) |
Input: gpio_keys_polled - switch to using gpio_request_one()
This saves us a few lines of code.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/keyboard/gpio_keys_polled.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index d72d0e5ebb85..f686fd970553 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c | |||
@@ -270,22 +270,14 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) | |||
270 | goto err_free_gpio; | 270 | goto err_free_gpio; |
271 | } | 271 | } |
272 | 272 | ||
273 | error = gpio_request(gpio, | 273 | error = gpio_request_one(gpio, GPIOF_IN, |
274 | button->desc ? button->desc : DRV_NAME); | 274 | button->desc ?: DRV_NAME); |
275 | if (error) { | 275 | if (error) { |
276 | dev_err(dev, "unable to claim gpio %u, err=%d\n", | 276 | dev_err(dev, "unable to claim gpio %u, err=%d\n", |
277 | gpio, error); | 277 | gpio, error); |
278 | goto err_free_gpio; | 278 | goto err_free_gpio; |
279 | } | 279 | } |
280 | 280 | ||
281 | error = gpio_direction_input(gpio); | ||
282 | if (error) { | ||
283 | dev_err(dev, | ||
284 | "unable to set direction on gpio %u, err=%d\n", | ||
285 | gpio, error); | ||
286 | goto err_free_gpio; | ||
287 | } | ||
288 | |||
289 | bdata->can_sleep = gpio_cansleep(gpio); | 281 | bdata->can_sleep = gpio_cansleep(gpio); |
290 | bdata->last_state = -1; | 282 | bdata->last_state = -1; |
291 | bdata->threshold = DIV_ROUND_UP(button->debounce_interval, | 283 | bdata->threshold = DIV_ROUND_UP(button->debounce_interval, |