]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()
authorJingoo Han <jg1.han@samsung.com>
Thu, 14 Mar 2013 01:30:21 +0000 (10:30 +0900)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 11 Jul 2013 19:06:20 +0000 (21:06 +0200)
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>
drivers/watchdog/s3c2410_wdt.c

index 3a9f6961db2d6abbc7844a41a7a8cc939b2b9ad0..c3beb3adc6f7e1bbbd3331beebb16b7a621b96ef 100644 (file)
@@ -358,7 +358,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;
        }
 
@@ -473,7 +473,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;