summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-02-12 17:34:35 +0400
committerWim Van Sebroeck <wim@iguana.be>2014-03-31 15:29:08 +0400
commitffb8eee4f140bbfc333381168d6fe1a7e7dc7af7 (patch)
treed295aeb1ce44c5af00ff5257d7fdb1c8a1ef8f7d /drivers/watchdog
parentf06cdfd184d845e1f01df7f636c0e3b5c5cc8d18 (diff)
downloadlinux-ffb8eee4f140bbfc333381168d6fe1a7e7dc7af7.tar.xz
watchdog: xilinx: Move no_timeout to probe function
no_timeout should be local variable because it is used only in probe function. 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/watchdog')
-rw-r--r--drivers/watchdog/of_xilinx_wdt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 39e61e15f723..3bc648f40e1f 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -51,7 +51,6 @@ struct xwdt_device {
static struct xwdt_device xdev;
static u32 timeout;
-static u8 no_timeout;
static DEFINE_SPINLOCK(spinlock);
@@ -159,8 +158,7 @@ static int xwdt_probe(struct platform_device *pdev)
u32 *tmptr;
u32 *pfreq;
struct resource *res;
-
- no_timeout = 0;
+ bool no_timeout = false;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
xdev.base = devm_ioremap_resource(&pdev->dev, res);
@@ -172,14 +170,14 @@ static int xwdt_probe(struct platform_device *pdev)
if (pfreq == NULL) {
pr_warn("The watchdog clock frequency cannot be obtained!\n");
- no_timeout = 1;
+ 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");
- no_timeout = 1;
+ no_timeout = true;
} else {
xdev.wdt_interval = *tmptr;
}