Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-block.git] / drivers / gpu / drm / nouveau / nvkm / engine / device / tegra.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index 2ed528c065fae6ba09d801a1401aa72fd0fa505d..ac9e122586bc94083dd9f046d0ff33b87eddc541 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -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);