The value in button->gpio is not valid when in this branch which is for
the case of gpiod. Do not print this out as it will always be 0 here.
While here, there is no reason to assign irq to error, use irq directly.
Lastly, dev_err_probe() returns the given error value, so we can return
directly the result of dev_err_probe() making this a single line.
Signed-off-by: Andrew Davis <redacted>
---
drivers/input/keyboard/gpio_keys.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index f9db86da0818b..05f8ccdfba920 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -580,13 +580,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
bdata->irq = button->irq;
} else {
irq = gpiod_to_irq(bdata->gpiod);
- if (irq < 0) {
- error = irq;
- dev_err_probe(dev, error,
- "Unable to get irq number for GPIO %d\n",
- button->gpio);
- return error;
- }
+ if (irq < 0)
+ return dev_err_probe(dev, irq, "Unable to get irq from GPIO\n");
bdata->irq = irq;
}
--
2.39.2