watchdog: xilinx: Use of_property_read_u32

Use of_property_read_u32 functions to clean 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>

1 files changed, 12 insertions, 17 deletions

diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 3b2469e42138..8c1a3f9fcefe 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -146,8 +146,7 @@ static u32 xwdt_selftest(struct xwdt_device *xdev)
 static int xwdt_probe(struct platform_device *pdev)
 {
         int rc;
-        u32 *tmptr;
-        u32 *pfreq;
+        u32 pfreq, enable_once = 0;
         struct resource *res;
         struct xwdt_device *xdev;
         bool no_timeout = false;
@@ -167,32 +166,28 @@ static int xwdt_probe(struct platform_device *pdev)
         if (IS_ERR(xdev->base))
                 return PTR_ERR(xdev->base);
 
-        pfreq = (u32 *)of_get_property(pdev->dev.of_node,
-                                        "clock-frequency", NULL);
-
-        if (pfreq == NULL) {
+        rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency", &pfreq);
+        if (rc) {
                 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) {
+        rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
+                                  &xdev->wdt_interval);
+        if (rc) {
                 dev_warn(&pdev->dev,
                          "Parameter \"xlnx,wdt-interval\" not found\n");
                 no_timeout = true;
-        } else {
-                xdev->wdt_interval = *tmptr;
         }
 
-        tmptr = (u32 *)of_get_property(pdev->dev.of_node,
-                                        "xlnx,wdt-enable-once", NULL);
-        if (tmptr == NULL) {
+        rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
+                                  &enable_once);
+        if (rc)
                 dev_warn(&pdev->dev,
                          "Parameter \"xlnx,wdt-enable-once\" not found\n");
-                watchdog_set_nowayout(xilinx_wdt_wdd, true);
-        }
+
+        watchdog_set_nowayout(xilinx_wdt_wdd, enable_once);
 
 /*
  *  Twice of the 2^wdt_interval / freq  because the first wdt overflow is
@@ -200,7 +195,7 @@ static int xwdt_probe(struct platform_device *pdev)
  */
         if (!no_timeout)
                 xilinx_wdt_wdd->timeout = 2 * ((1 << xdev->wdt_interval) /
-                                          *pfreq);
+                                          pfreq);
 
         spin_lock_init(&xdev->spinlock);
         watchdog_set_drvdata(xilinx_wdt_wdd, xdev);