Commit db19fd8b authored by Ben Dooks's avatar Ben Dooks Committed by Dmitry Torokhov

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: default avatarBen Dooks <ben@simtec.co.uk>
Signed-off-by: default avatarSimtec Linux Team <linux@simtec.co.uk>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent fb141597
...@@ -78,6 +78,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -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_platform_data *pdata = pdev->dev.platform_data;
struct gpio_keys_drvdata *ddata; struct gpio_keys_drvdata *ddata;
struct device *dev = &pdev->dev;
struct input_dev *input; struct input_dev *input;
int i, error; int i, error;
int wakeup = 0; int wakeup = 0;
...@@ -87,6 +88,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -87,6 +88,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
input = input_allocate_device(); input = input_allocate_device();
if (!ddata || !input) { if (!ddata || !input) {
dev_err(dev, "failed to allocate state\n");
error = -ENOMEM; error = -ENOMEM;
goto fail1; goto fail1;
} }
...@@ -122,14 +124,14 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -122,14 +124,14 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
error = gpio_request(button->gpio, button->desc ?: "gpio_keys"); error = gpio_request(button->gpio, button->desc ?: "gpio_keys");
if (error < 0) { if (error < 0) {
pr_err("gpio-keys: failed to request GPIO %d," dev_err(dev, "failed to request GPIO %d, error %d\n",
" error %d\n", button->gpio, error); button->gpio, error);
goto fail2; goto fail2;
} }
error = gpio_direction_input(button->gpio); error = gpio_direction_input(button->gpio);
if (error < 0) { if (error < 0) {
pr_err("gpio-keys: failed to configure input" dev_err(dev, "failed to configure"
" direction for GPIO %d, error %d\n", " direction for GPIO %d, error %d\n",
button->gpio, error); button->gpio, error);
gpio_free(button->gpio); gpio_free(button->gpio);
...@@ -139,8 +141,8 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -139,8 +141,8 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
irq = gpio_to_irq(button->gpio); irq = gpio_to_irq(button->gpio);
if (irq < 0) { if (irq < 0) {
error = irq; error = irq;
pr_err("gpio-keys: Unable to get irq number" dev_err(dev, "Unable to get irq number "
" for GPIO %d, error %d\n", "for GPIO %d, error %d\n",
button->gpio, error); button->gpio, error);
gpio_free(button->gpio); gpio_free(button->gpio);
goto fail2; goto fail2;
...@@ -152,7 +154,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -152,7 +154,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
button->desc ? button->desc : "gpio_keys", button->desc ? button->desc : "gpio_keys",
bdata); bdata);
if (error) { 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); irq, error);
gpio_free(button->gpio); gpio_free(button->gpio);
goto fail2; goto fail2;
...@@ -166,7 +168,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) ...@@ -166,7 +168,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
error = input_register_device(input); error = input_register_device(input);
if (error) { if (error) {
pr_err("gpio-keys: Unable to register input device, " dev_err(dev, "Unable to register input device, "
"error: %d\n", error); "error: %d\n", error);
goto fail2; goto fail2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment