| Message ID | 20210616181708.19530-2-info@metux.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] watchdog: iTCO_wdt: use pm_ptr() | expand |
On Wed, Jun 16, 2021 at 08:17:08PM +0200, Enrico Weigelt, metux IT consult wrote: > Use dev_err() instead of pr_err(), so device name is also shown in the log. > > Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/iTCO_wdt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c > index 6ba2b2f60737..35ff8d3fd9fc 100644 > --- a/drivers/watchdog/iTCO_wdt.c > +++ b/drivers/watchdog/iTCO_wdt.c > @@ -479,13 +479,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev) > if (!devm_request_region(dev, p->smi_res->start, > resource_size(p->smi_res), > pdev->name)) { > - pr_err("I/O address 0x%04llx already in use, device disabled\n", > + dev_err(dev, "I/O address 0x%04llx already in use, device disabled\n", > (u64)SMI_EN(p)); > return -EBUSY; > } > } else if (iTCO_vendorsupport || > turn_SMI_watchdog_clear_off >= p->iTCO_version) { > - pr_err("SMI I/O resource is missing\n"); > + dev_err(dev, "SMI I/O resource is missing\n"); > return -ENODEV; > } > > -- > 2.20.1 >
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 6ba2b2f60737..35ff8d3fd9fc 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c @@ -479,13 +479,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev) if (!devm_request_region(dev, p->smi_res->start, resource_size(p->smi_res), pdev->name)) { - pr_err("I/O address 0x%04llx already in use, device disabled\n", + dev_err(dev, "I/O address 0x%04llx already in use, device disabled\n", (u64)SMI_EN(p)); return -EBUSY; } } else if (iTCO_vendorsupport || turn_SMI_watchdog_clear_off >= p->iTCO_version) { - pr_err("SMI I/O resource is missing\n"); + dev_err(dev, "SMI I/O resource is missing\n"); return -ENODEV; }
Use dev_err() instead of pr_err(), so device name is also shown in the log. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> --- drivers/watchdog/iTCO_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)