FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-28 12:25:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: xilinx: Fix all printk messages

Browse Source 
Use dev_ functions for printk messages.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Michal Simek 2014-02-12 14:41:20 +01:00 committed by Wim Van Sebroeck
parent 9066317178
commit 4c7fbbc4a5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/watchdog/of_xilinx_wdt.c
View File

@ -10,8 +10,6 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
@ -41,7 +39,6 @@
#define XWT_TIMER_FAILED 0xFFFFFFFF #define XWT_TIMER_FAILED 0xFFFFFFFF
#define WATCHDOG_NAME "Xilinx Watchdog" #define WATCHDOG_NAME "Xilinx Watchdog"
#define PFX WATCHDOG_NAME ": "
struct xwdt_device { struct xwdt_device {
void __iomem *base; void __iomem *base;
@ -174,14 +171,16 @@ static int xwdt_probe(struct platform_device *pdev)
"clock-frequency", NULL); "clock-frequency", NULL);
if (pfreq == NULL) { if (pfreq == NULL) {
pr_warn("The watchdog clock frequency cannot be obtained!\n"); dev_warn(&pdev->dev,
"The watchdog clock frequency cannot be obtained\n");
no_timeout = true; no_timeout = true;
} }
tmptr = (u32 *)of_get_property(pdev->dev.of_node, tmptr = (u32 *)of_get_property(pdev->dev.of_node,
"xlnx,wdt-interval", NULL); "xlnx,wdt-interval", NULL);
if (tmptr == NULL) { if (tmptr == NULL) {
pr_warn("Parameter \"xlnx,wdt-interval\" not found in device tree!\n"); dev_warn(&pdev->dev,
"Parameter \"xlnx,wdt-interval\" not found\n");
no_timeout = true; no_timeout = true;
} else { } else {
xdev->wdt_interval = *tmptr; xdev->wdt_interval = *tmptr;
@ -190,7 +189,8 @@ static int xwdt_probe(struct platform_device *pdev)
tmptr = (u32 *)of_get_property(pdev->dev.of_node, tmptr = (u32 *)of_get_property(pdev->dev.of_node,
"xlnx,wdt-enable-once", NULL); "xlnx,wdt-enable-once", NULL);
if (tmptr == NULL) { if (tmptr == NULL) {
pr_warn("Parameter \"xlnx,wdt-enable-once\" not found in device tree!\n"); dev_warn(&pdev->dev,
"Parameter \"xlnx,wdt-enable-once\" not found\n");
watchdog_set_nowayout(xilinx_wdt_wdd, true); watchdog_set_nowayout(xilinx_wdt_wdd, true);
} }
@ -207,13 +207,13 @@ static int xwdt_probe(struct platform_device *pdev)
rc = xwdt_selftest(xdev); rc = xwdt_selftest(xdev);
if (rc == XWT_TIMER_FAILED) { if (rc == XWT_TIMER_FAILED) {
pr_err("SelfTest routine error!\n"); dev_err(&pdev->dev, "SelfTest routine error\n");
return rc; return rc;
} }
rc = watchdog_register_device(xilinx_wdt_wdd); rc = watchdog_register_device(xilinx_wdt_wdd);
if (rc) { if (rc) {
pr_err("cannot register watchdog (err=%d)\n", rc); dev_err(&pdev->dev, "Cannot register watchdog (err=%d)\n", rc);
return rc; return rc;
} }