From: Andrew Davis <afd@ti.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Thomas Gleixner <tglx@kernel.org>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Andrew Davis" <afd@ti.com>
Subject: [PATCH] Input: gpio-keys - do not print gpio number if using gpiod
Date: Mon, 2 Mar 2026 10:59:50 -0600 [thread overview]
Message-ID: <20260302165950.2159401-1-afd@ti.com> (raw)
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 <afd@ti.com>
---
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 e196174856796..a6ac693d8fce5 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
next reply other threads:[~2026-03-02 17:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-02 16:59 Andrew Davis [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-13 15:10 [PATCH] Input: gpio-keys - do not print gpio number if using gpiod Andrew Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260302165950.2159401-1-afd@ti.com \
--to=afd@ti.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox