watchdog: xilinx: Move no_timeout to probe function
authorMichal Simek <michal.simek@xilinx.com>
Wed, 12 Feb 2014 13:34:35 +0000 (14:34 +0100)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 31 Mar 2014 11:29:08 +0000 (13:29 +0200)
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>
drivers/watchdog/of_xilinx_wdt.c

index 39e61e15f7233e7671f9e32bcfd277e1894b4798..3bc648f40e1f248e09170293c22bc183dc8fd269 100644 (file)
@@ -51,7 +51,6 @@ struct xwdt_device {
 static struct xwdt_device xdev;
 
 static  u32 timeout;
 static struct xwdt_device xdev;
 
 static  u32 timeout;
-static  u8  no_timeout;
 
 static  DEFINE_SPINLOCK(spinlock);
 
 
 static  DEFINE_SPINLOCK(spinlock);
 
@@ -159,8 +158,7 @@ static int xwdt_probe(struct platform_device *pdev)
        u32 *tmptr;
        u32 *pfreq;
        struct resource *res;
        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);
 
        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");
 
        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");
        }
 
        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;
        }
        } else {
                xdev.wdt_interval = *tmptr;
        }