media: st-delta: Remove unneeded NULL check in delta-v4l2
authorWan Jiabing <wanjiabing@vivo.com>
Mon, 16 May 2022 13:13:30 +0000 (14:13 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 20 Jun 2022 09:30:30 +0000 (10:30 +0100)
clk_prepare_enable() already checks NULL by using !clk.
clk_disable_unprepare() already checks NULL by using IS_ERR_OR_NULL.
Remove unneeded NULL checks before them.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/platform/st/sti/delta/delta-v4l2.c

index 420ad4d..03eaee6 100644 (file)
@@ -1669,14 +1669,12 @@ static int delta_open(struct file *file)
        set_default_params(ctx);
 
        /* enable ST231 clocks */
-       if (delta->clk_st231)
-               if (clk_prepare_enable(delta->clk_st231))
-                       dev_warn(delta->dev, "failed to enable st231 clk\n");
+       if (clk_prepare_enable(delta->clk_st231))
+               dev_warn(delta->dev, "failed to enable st231 clk\n");
 
        /* enable FLASH_PROMIP clock */
-       if (delta->clk_flash_promip)
-               if (clk_prepare_enable(delta->clk_flash_promip))
-                       dev_warn(delta->dev, "failed to enable delta promip clk\n");
+       if (clk_prepare_enable(delta->clk_flash_promip))
+               dev_warn(delta->dev, "failed to enable delta promip clk\n");
 
        mutex_unlock(&delta->lock);
 
@@ -1717,12 +1715,10 @@ static int delta_release(struct file *file)
        v4l2_fh_exit(&ctx->fh);
 
        /* disable ST231 clocks */
-       if (delta->clk_st231)
-               clk_disable_unprepare(delta->clk_st231);
+       clk_disable_unprepare(delta->clk_st231);
 
        /* disable FLASH_PROMIP clock */
-       if (delta->clk_flash_promip)
-               clk_disable_unprepare(delta->clk_flash_promip);
+       clk_disable_unprepare(delta->clk_flash_promip);
 
        dev_dbg(delta->dev, "%s decoder instance released\n", ctx->name);
 
@@ -1926,8 +1922,7 @@ static int delta_runtime_suspend(struct device *dev)
 {
        struct delta_dev *delta = dev_get_drvdata(dev);
 
-       if (delta->clk_delta)
-               clk_disable_unprepare(delta->clk_delta);
+       clk_disable_unprepare(delta->clk_delta);
 
        return 0;
 }
@@ -1936,9 +1931,8 @@ static int delta_runtime_resume(struct device *dev)
 {
        struct delta_dev *delta = dev_get_drvdata(dev);
 
-       if (delta->clk_delta)
-               if (clk_prepare_enable(delta->clk_delta))
-                       dev_warn(dev, "failed to prepare/enable delta clk\n");
+       if (clk_prepare_enable(delta->clk_delta))
+               dev_warn(dev, "failed to prepare/enable delta clk\n");
 
        return 0;
 }