OSDN Git Service

watchdog: of_xilinx_wdt: Remove passing null pointer
authorSrinivas Neeli <srinivas.neeli@xilinx.com>
Mon, 29 Mar 2021 16:19:38 +0000 (21:49 +0530)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 21 Jun 2021 06:49:07 +0000 (08:49 +0200)
clk is an optional property, if clock not defined,
calling clk_prepare_enable() and devm_add_action_or_reset()
are not useful.
so calling these two apis only when clock is present.

Addresses-Coverity:"FORWARD_NULL"

Signed-off-by: Srinivas Neeli <srinivas.neeli@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210329161939.37680-5-srinivas.neeli@xilinx.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/of_xilinx_wdt.c

index 5f31fde..afbff79 100644 (file)
@@ -211,6 +211,15 @@ static int xwdt_probe(struct platform_device *pdev)
                                 "The watchdog clock freq cannot be obtained\n");
        } else {
                pfreq = clk_get_rate(xdev->clk);
+               rc = clk_prepare_enable(xdev->clk);
+               if (rc) {
+                       dev_err(dev, "unable to enable clock\n");
+                       return rc;
+               }
+               rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
+                                             xdev->clk);
+               if (rc)
+                       return rc;
        }
 
        /*
@@ -224,16 +233,6 @@ static int xwdt_probe(struct platform_device *pdev)
        spin_lock_init(&xdev->spinlock);
        watchdog_set_drvdata(xilinx_wdt_wdd, xdev);
 
-       rc = clk_prepare_enable(xdev->clk);
-       if (rc) {
-               dev_err(dev, "unable to enable clock\n");
-               return rc;
-       }
-       rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
-                                     xdev->clk);
-       if (rc)
-               return rc;
-
        rc = xwdt_selftest(xdev);
        if (rc == XWT_TIMER_FAILED) {
                dev_err(dev, "SelfTest routine error\n");