Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[mirror_ubuntu-hirsute-kernel.git] / drivers / watchdog / stm32_iwdg.c

diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c
index 25188d6bbe1523586388a489881f32288ee3db7c..a3436c296c97b2f80c8b7c8bbe901ce8a3837042 100644 (file)
--- a/drivers/watchdog/stm32_iwdg.c
+++ b/drivers/watchdog/stm32_iwdg.c
@@ -162,18 +162,15 @@ static int stm32_iwdg_clk_init(struct platform_device *pdev,
        u32 ret;
 
        wdt->clk_lsi = devm_clk_get(dev, "lsi");
-       if (IS_ERR(wdt->clk_lsi)) {
-               dev_err(dev, "Unable to get lsi clock\n");
-               return PTR_ERR(wdt->clk_lsi);
-       }
+       if (IS_ERR(wdt->clk_lsi))
+               return dev_err_probe(dev, PTR_ERR(wdt->clk_lsi), "Unable to get lsi clock\n");
 
        /* optional peripheral clock */
        if (wdt->data->has_pclk) {
                wdt->clk_pclk = devm_clk_get(dev, "pclk");
-               if (IS_ERR(wdt->clk_pclk)) {
-                       dev_err(dev, "Unable to get pclk clock\n");
-                       return PTR_ERR(wdt->clk_pclk);
-               }
+               if (IS_ERR(wdt->clk_pclk))
+                       return dev_err_probe(dev, PTR_ERR(wdt->clk_pclk),
+                                            "Unable to get pclk clock\n");
 
                ret = clk_prepare_enable(wdt->clk_pclk);
                if (ret) {