]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/nouveau/tegra: remove needless NULL check
authorGuo Zhengkui <guozhengkui@vivo.com>
Thu, 19 May 2022 07:29:48 +0000 (15:29 +0800)
committerLyude Paul <lyude@redhat.com>
Mon, 23 May 2022 20:13:17 +0000 (16:13 -0400)
There has already been NULL check in clk_prepare_enable() and
clk_disable_unprepare(), so remove needless NULL check before
calling them.

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220519072950.128268-1-guozhengkui@vivo.com
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c

index 992cc285f2fecfb7c126fdc59e107e4cb415a904..493c297966d9aec65a94e9e45ac34684f60299ec 100644 (file)
@@ -41,11 +41,9 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
        ret = clk_prepare_enable(tdev->clk);
        if (ret)
                goto err_clk;
-       if (tdev->clk_ref) {
-               ret = clk_prepare_enable(tdev->clk_ref);
-               if (ret)
-                       goto err_clk_ref;
-       }
+       ret = clk_prepare_enable(tdev->clk_ref);
+       if (ret)
+               goto err_clk_ref;
        ret = clk_prepare_enable(tdev->clk_pwr);
        if (ret)
                goto err_clk_pwr;
@@ -70,8 +68,7 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
 err_clamp:
        clk_disable_unprepare(tdev->clk_pwr);
 err_clk_pwr:
-       if (tdev->clk_ref)
-               clk_disable_unprepare(tdev->clk_ref);
+       clk_disable_unprepare(tdev->clk_ref);
 err_clk_ref:
        clk_disable_unprepare(tdev->clk);
 err_clk:
@@ -87,8 +84,7 @@ nvkm_device_tegra_power_down(struct nvkm_device_tegra *tdev)
        int ret;
 
        clk_disable_unprepare(tdev->clk_pwr);
-       if (tdev->clk_ref)
-               clk_disable_unprepare(tdev->clk_ref);
+       clk_disable_unprepare(tdev->clk_ref);
        clk_disable_unprepare(tdev->clk);
        udelay(10);