diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-02-12 14:41:20 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2014-03-31 13:29:14 +0200 |
| commit | 4c7fbbc4a57a35ed109f58f52eff1a04660789e9 (patch) | |
| tree | e7e6b10ba6463f6327bf670a753d366c14b93f63 /drivers | |
| parent | 9066317178ca87b9d958f801c8fcf784ec31c6c3 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/of_xilinx_wdt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index ac3f6ebd0c2..3b2469e4213 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -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; } |