forked from luck/tmp_suning_uos_patched
watchdog: xilinx: Fix all printk messages
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:
parent
9066317178
commit
4c7fbbc4a5
@ -10,8 +10,6 @@
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/err.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
@ -41,7 +39,6 @@
|
||||
#define XWT_TIMER_FAILED 0xFFFFFFFF
|
||||
|
||||
#define WATCHDOG_NAME "Xilinx Watchdog"
|
||||
#define PFX WATCHDOG_NAME ": "
|
||||
|
||||
struct xwdt_device {
|
||||
void __iomem *base;
|
||||
@ -174,14 +171,16 @@ static int xwdt_probe(struct platform_device *pdev)
|
||||
"clock-frequency", 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;
|
||||
}
|
||||
|
||||
tmptr = (u32 *)of_get_property(pdev->dev.of_node,
|
||||
"xlnx,wdt-interval", 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;
|
||||
} else {
|
||||
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,
|
||||
"xlnx,wdt-enable-once", 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);
|
||||
}
|
||||
|
||||
@ -207,13 +207,13 @@ static int xwdt_probe(struct platform_device *pdev)
|
||||
|
||||
rc = xwdt_selftest(xdev);
|
||||
if (rc == XWT_TIMER_FAILED) {
|
||||
pr_err("SelfTest routine error!\n");
|
||||
dev_err(&pdev->dev, "SelfTest routine error\n");
|
||||
return rc;
|
||||
}
|
||||
|
||||
rc = watchdog_register_device(xilinx_wdt_wdd);
|
||||
if (rc) {
|
||||
pr_err("cannot register watchdog (err=%d)\n", rc);
|
||||
dev_err(&pdev->dev, "Cannot register watchdog (err=%d)\n", rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user