From: Ben Dooks <ben@simtec.co.uk>
To: linux-input@vger.kernel.org
Cc: Simtec Linux Team <linux@simtec.co.uk>
Subject: [patch 1/3] gpio_keys: use dev_ macros to report information
Date: Tue, 10 Nov 2009 22:59:38 +0000 [thread overview]
Message-ID: <20091110230002.096943221@fluff.org.uk> (raw)
In-Reply-To: 20091110225937.922379610@fluff.org.uk
[-- Attachment #1: simtec/ready/gpio-buttons-used-dev-reporting.patch --]
[-- Type: text/plain, Size: 2703 bytes --]
The gpio_keys driver is binding to a platform device but using pr_err()
to report errors. Change to using dev_err() so that all messages are
prefixed by the device name.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
---
drivers/input/keyboard/gpio_keys.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Index: b/drivers/input/keyboard/gpio_keys.c
===================================================================
--- a/drivers/input/keyboard/gpio_keys.c 2009-11-03 22:17:12.000000000 +0000
+++ b/drivers/input/keyboard/gpio_keys.c 2009-11-03 22:22:45.000000000 +0000
@@ -78,6 +78,7 @@ static int __devinit gpio_keys_probe(str
{
struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
struct gpio_keys_drvdata *ddata;
+ struct device *dev = &pdev->dev;
struct input_dev *input;
int i, error;
int wakeup = 0;
@@ -87,6 +88,7 @@ static int __devinit gpio_keys_probe(str
GFP_KERNEL);
input = input_allocate_device();
if (!ddata || !input) {
+ dev_err(dev, "failed to allocate state\n");
error = -ENOMEM;
goto fail1;
}
@@ -122,14 +124,14 @@ static int __devinit gpio_keys_probe(str
error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
if (error < 0) {
- pr_err("gpio-keys: failed to request GPIO %d,"
- " error %d\n", button->gpio, error);
+ dev_err(dev, "failed to request GPIO %d, error %d\n",
+ button->gpio, error);
goto fail2;
}
error = gpio_direction_input(button->gpio);
if (error < 0) {
- pr_err("gpio-keys: failed to configure input"
+ dev_err(dev, "failed to configure"
" direction for GPIO %d, error %d\n",
button->gpio, error);
gpio_free(button->gpio);
@@ -139,8 +141,8 @@ static int __devinit gpio_keys_probe(str
irq = gpio_to_irq(button->gpio);
if (irq < 0) {
error = irq;
- pr_err("gpio-keys: Unable to get irq number"
- " for GPIO %d, error %d\n",
+ dev_err(dev, "Unable to get irq number "
+ "for GPIO %d, error %d\n",
button->gpio, error);
gpio_free(button->gpio);
goto fail2;
@@ -152,7 +154,7 @@ static int __devinit gpio_keys_probe(str
button->desc ? button->desc : "gpio_keys",
bdata);
if (error) {
- pr_err("gpio-keys: Unable to claim irq %d; error %d\n",
+ dev_err(dev, "Unable to claim irq %d; error %d\n",
irq, error);
gpio_free(button->gpio);
goto fail2;
@@ -166,7 +168,7 @@ static int __devinit gpio_keys_probe(str
error = input_register_device(input);
if (error) {
- pr_err("gpio-keys: Unable to register input device, "
+ dev_err(dev, "Unable to register input device, "
"error: %d\n", error);
goto fail2;
}
next prev parent reply other threads:[~2009-11-10 22:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-10 22:59 [patch 0/3] gpio_keys driver updates Ben Dooks
2009-11-10 22:59 ` Ben Dooks [this message]
2009-11-10 22:59 ` [patch 2/3] gpio_keys: use <linux/gpio.h> instead of <asm/gpio.h> Ben Dooks
2009-11-10 22:59 ` [patch 3/3] gpio_keys: seperate individual button setup to make code neater Ben Dooks
2009-11-11 5:08 ` [patch 0/3] gpio_keys driver updates Dmitry Torokhov
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=20091110230002.096943221@fluff.org.uk \
--to=ben@simtec.co.uk \
--cc=linux-input@vger.kernel.org \
--cc=linux@simtec.co.uk \
/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;
as well as URLs for NNTP newsgroup(s).