2013-04-29 09:26:16

by Jingoo Han

Subject: [PATCH RESEND 1/2] watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()

dev_err()/dev_info() are more preferred than pr_err()/pr_info().

Signed-off-by: Jingoo Han <[email protected]>
---
drivers/watchdog/s3c2410_wdt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index ee03135..c9f480d 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -349,7 +349,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)

ret = s3c2410wdt_cpufreq_register();
if (ret < 0) {
- pr_err("failed to register cpufreq\n");
+ dev_err(dev, "failed to register cpufreq\n");
goto err_clk;
}

@@ -464,7 +464,7 @@ static int s3c2410wdt_resume(struct platform_device *dev)
writel(wtdat_save, wdt_base + S3C2410_WTCNT); /* Reset count */
writel(wtcon_save, wdt_base + S3C2410_WTCON);

- pr_info("watchdog %sabled\n",
+ dev_info(&dev->dev, "watchdog %sabled\n",
(wtcon_save & S3C2410_WTCON_ENABLE) ? "en" : "dis");

return 0;
--
1.7.2.5

2013-04-29 16:35:01

by Guenter Roeck

Subject: Re: [PATCH RESEND 1/2] watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()

On Mon, Apr 29, 2013 at 06:26:12PM +0900, Jingoo Han wrote:
> dev_err()/dev_info() are more preferred than pr_err()/pr_info().
>
> Signed-off-by: Jingoo Han <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>