[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <52d86e3f2b957411deafbdfbd4bf93bb78f491ac.1392101734.git.michal.simek@xilinx.com>
Date: Tue, 11 Feb 2014 07:55:54 +0100
From: Michal Simek <michal.simek@...inx.com>
To: linux-kernel@...r.kernel.org, monstr@...str.eu
Cc: Guenter Roeck <linux@...ck-us.net>,
Wim Van Sebroeck <wim@...ana.be>,
linux-watchdog@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
Subject: [PATCH v2 11/11] watchdog: xilinx: Remove no_timeout variable
Remove no_timeout variable and check variables
directly.
Suggested-by: Rob Herring <robherring2@...il.com>
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
Changes in v2:
- New patch in this series
drivers/watchdog/of_xilinx_wdt.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index dad8fb5..fc91285 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -147,10 +147,9 @@ static u32 xwdt_selftest(struct xwdt_device *xdev)
static int xwdt_probe(struct platform_device *pdev)
{
int rc;
- u32 pfreq, enable_once = 0;
+ u32 pfreq = 0, enable_once = 0;
struct resource *res;
struct xwdt_device *xdev;
- bool no_timeout = false;
struct watchdog_device *xilinx_wdt_wdd;
xdev = devm_kzalloc(&pdev->dev, sizeof(*xdev), GFP_KERNEL);
@@ -168,19 +167,15 @@ static int xwdt_probe(struct platform_device *pdev)
return PTR_ERR(xdev->base);
rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency", &pfreq);
- if (rc) {
+ if (rc)
dev_warn(&pdev->dev,
"The watchdog clock frequency cannot be obtained\n");
- no_timeout = true;
- }
rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
&xdev->wdt_interval);
- if (rc) {
+ if (rc)
dev_warn(&pdev->dev,
"Parameter \"xlnx,wdt-interval\" not found\n");
- no_timeout = true;
- }
rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
&enable_once);
@@ -195,7 +190,7 @@ static int xwdt_probe(struct platform_device *pdev)
* Twice of the 2^wdt_interval / freq because the first wdt overflow is
* ignored (interrupt), reset is only generated at second wdt overflow
*/
- if (!no_timeout)
+ if (pfreq && xdev->wdt_interval)
xilinx_wdt_wdd->timeout = 2 * ((1 << xdev->wdt_interval) /
pfreq);
--
1.8.2.3
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists