diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-11-10 21:00:35 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-11-20 00:52:06 -0800 |
| commit | db19fd8b3a3e198e84b93fa217acf77e72a4cd35 (patch) | |
| tree | 87cf49b790e03e81df8091861fb10f77d4ed5459 /drivers/input/keyboard/gpio_keys.c | |
| parent | fb141597550243b471f3bd526fe689aa3b74df25 (diff) | |
| download | op-kernel-dev-db19fd8b3a3e198e84b93fa217acf77e72a4cd35.zip op-kernel-dev-db19fd8b3a3e198e84b93fa217acf77e72a4cd35.tar.gz | |
Input: gpio_keys - use dev_ macros to report information
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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard/gpio_keys.c')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 77d1309..5c8e211 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -78,6 +78,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) { 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(struct platform_device *pdev) 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(struct platform_device *pdev) 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(struct platform_device *pdev) 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(struct platform_device *pdev) 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(struct platform_device *pdev) 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; } |
