]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
wdt: dw: Switch to if(CONFIG()) instead of using #if
authorSean Anderson <seanga2@gmail.com>
Thu, 11 Mar 2021 02:02:18 +0000 (21:02 -0500)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Thu, 8 Apr 2021 07:37:27 +0000 (15:37 +0800)
This is preferred over #if because the compiler can check syntax even if
the feature is disabled. This cannot be used for CONFIG_CLK because
CONFIG_DW_WDT_CLOCK_KHZ is not defined on all platforms.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
drivers/watchdog/designware_wdt.c

index 1f0c5a77c929d34767af6ca2b3c5ecb165da3e71..a65487d4f3435c7fd873bf7bf015e38aae12178a 100644 (file)
@@ -136,17 +136,17 @@ static int designware_wdt_probe(struct udevice *dev)
        priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ;
 #endif
 
-#if CONFIG_IS_ENABLED(DM_RESET)
-       struct reset_ctl_bulk resets;
+       if (CONFIG_IS_ENABLED(DM_RESET)) {
+               struct reset_ctl_bulk resets;
 
-       ret = reset_get_bulk(dev, &resets);
-       if (ret)
-               return ret;
+               ret = reset_get_bulk(dev, &resets);
+               if (ret)
+                       return ret;
 
-       ret = reset_deassert_bulk(&resets);
-       if (ret)
-               return ret;
-#endif
+               ret = reset_deassert_bulk(&resets);
+               if (ret)
+                       return ret;
+       }
 
        /* reset to disable the watchdog */
        return designware_wdt_stop(dev);