diff options
| author |   Hans de Goede <hdegoede@redhat.com> | 2017-03-09 09:47:01 -0800 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-03-09 10:01:02 -0800 |
| commit | 73915f369e6957c0d7ddca9f7435cc6f76d5320a (patch) | |
| tree | 202b8258b67f0254458759aaef754f1cb787452f /drivers/input/misc | |
| parent | Input: drv260x - remove OF dependency (diff) | |
| download | linux-dev-73915f369e6957c0d7ddca9f7435cc6f76d5320a.tar.xz linux-dev-73915f369e6957c0d7ddca9f7435cc6f76d5320a.zip | |
Input: axp20x-pek - use our own device for errors
Before this commit axp20x-pek was mixing 2 style error reporting calls:
dev_err(&pdev->dev, ...);
dev_err(axp20x->dev, ...);
But the second is our parent device, not our own device, so switch to
using &pdev->dev everywhere.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/axp20x-pek.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c index 1ac898db303a..a041365b1868 100644 --- a/drivers/input/misc/axp20x-pek.c +++ b/drivers/input/misc/axp20x-pek.c @@ -239,7 +239,7 @@ static int axp20x_pek_probe(struct platform_device *pdev) axp20x_pek_irq, 0, "axp20x-pek-dbr", idev); if (error < 0) { - dev_err(axp20x->dev, "Failed to request dbr IRQ#%d: %d\n", + dev_err(&pdev->dev, "Failed to request dbr IRQ#%d: %d\n", axp20x_pek->irq_dbr, error); return error; } @@ -248,14 +248,14 @@ static int axp20x_pek_probe(struct platform_device *pdev) axp20x_pek_irq, 0, "axp20x-pek-dbf", idev); if (error < 0) { - dev_err(axp20x->dev, "Failed to request dbf IRQ#%d: %d\n", + dev_err(&pdev->dev, "Failed to request dbf IRQ#%d: %d\n", axp20x_pek->irq_dbf, error); return error; } error = sysfs_create_group(&pdev->dev.kobj, &axp20x_attribute_group); if (error) { - dev_err(axp20x->dev, "Failed to create sysfs attributes: %d\n", + dev_err(&pdev->dev, "Failed to create sysfs attributes: %d\n", error); return error; } @@ -271,7 +271,7 @@ static int axp20x_pek_probe(struct platform_device *pdev) error = input_register_device(idev); if (error) { - dev_err(axp20x->dev, "Can't register input device: %d\n", + dev_err(&pdev->dev, "Can't register input device: %d\n", error); return error; } |