aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-03-13 21:30:21 -0400
committerWim Van Sebroeck <wim@iguana.be>2013-07-11 15:06:20 -0400
commit3828924af2e24a615b302fe1da69527d58474cdc (patch)
tree3bac0dbdf4e623d823467b32a7a3ad342496858c
parent1ae995dca9da3a5671aa471e1c355e47437a1056 (diff)
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 <jg1.han@samsung.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/s3c2410_wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 3a9f6961db2d..c3beb3adc6f7 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -358,7 +358,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
358 358
359 ret = s3c2410wdt_cpufreq_register(); 359 ret = s3c2410wdt_cpufreq_register();
360 if (ret < 0) { 360 if (ret < 0) {
361 pr_err("failed to register cpufreq\n"); 361 dev_err(dev, "failed to register cpufreq\n");
362 goto err_clk; 362 goto err_clk;
363 } 363 }
364 364
@@ -473,7 +473,7 @@ static int s3c2410wdt_resume(struct platform_device *dev)
473 writel(wtdat_save, wdt_base + S3C2410_WTCNT); /* Reset count */ 473 writel(wtdat_save, wdt_base + S3C2410_WTCNT); /* Reset count */
474 writel(wtcon_save, wdt_base + S3C2410_WTCON); 474 writel(wtcon_save, wdt_base + S3C2410_WTCON);
475 475
476 pr_info("watchdog %sabled\n", 476 dev_info(&dev->dev, "watchdog %sabled\n",
477 (wtcon_save & S3C2410_WTCON_ENABLE) ? "en" : "dis"); 477 (wtcon_save & S3C2410_WTCON_ENABLE) ? "en" : "dis");
478 478
479 return 0; 479 return 0;