]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
watchdog: npcm: Remove unnecessary NULL check before clk_prepare_enable/clk_disable_u...
authorChen Ni <nichen@iscas.ac.cn>
Thu, 13 Mar 2025 08:44:19 +0000 (16:44 +0800)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sun, 16 Mar 2025 10:00:32 +0000 (11:00 +0100)
clk_prepare_enable() and clk_disable_unprepare() already checked
NULL clock parameter.Remove unneeded NULL check for clk here.

Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20250313084420.2481763-1-nichen@iscas.ac.cn
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/npcm_wdt.c

index a5dd1c2301374402ae4d28265798438ddd8cba34..e62ea054bc6185878ec0028160f6754ecd714530 100644 (file)
@@ -68,8 +68,7 @@ static int npcm_wdt_start(struct watchdog_device *wdd)
        struct npcm_wdt *wdt = to_npcm_wdt(wdd);
        u32 val;
 
-       if (wdt->clk)
-               clk_prepare_enable(wdt->clk);
+       clk_prepare_enable(wdt->clk);
 
        if (wdd->timeout < 2)
                val = 0x800;
@@ -105,8 +104,7 @@ static int npcm_wdt_stop(struct watchdog_device *wdd)
 
        writel(0, wdt->reg);
 
-       if (wdt->clk)
-               clk_disable_unprepare(wdt->clk);
+       clk_disable_unprepare(wdt->clk);
 
        return 0;
 }
@@ -156,8 +154,7 @@ static int npcm_wdt_restart(struct watchdog_device *wdd,
        struct npcm_wdt *wdt = to_npcm_wdt(wdd);
 
        /* For reset, we start the WDT clock and leave it running. */
-       if (wdt->clk)
-               clk_prepare_enable(wdt->clk);
+       clk_prepare_enable(wdt->clk);
 
        writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, wdt->reg);
        udelay(1000);