* [PATCH] drm/nouveau/tegra: remove needless NULL check
@ 2022-05-19 7:29 Guo Zhengkui
2022-05-23 20:11 ` Lyude Paul
0 siblings, 1 reply; 2+ messages in thread
From: Guo Zhengkui @ 2022-05-19 7:29 UTC (permalink / raw)
To: Ben Skeggs, Karol Herbst, Lyude Paul, David Airlie,
Daniel Vetter, Thierry Reding, Jonathan Hunter, Robin Murphy,
Guo Zhengkui, Jason Gunthorpe, Joerg Roedel, Lu Baolu,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS,
open list:TEGRA ARCHITECTURE SUPPORT, open list
Cc: zhengkui_guo
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>
---
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index 2ed528c065fa..ac9e122586bc 100644
--- 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);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/nouveau/tegra: remove needless NULL check
2022-05-19 7:29 [PATCH] drm/nouveau/tegra: remove needless NULL check Guo Zhengkui
@ 2022-05-23 20:11 ` Lyude Paul
0 siblings, 0 replies; 2+ messages in thread
From: Lyude Paul @ 2022-05-23 20:11 UTC (permalink / raw)
To: Guo Zhengkui, Ben Skeggs, Karol Herbst, David Airlie,
Daniel Vetter, Thierry Reding, Jonathan Hunter, Robin Murphy,
Jason Gunthorpe, Joerg Roedel, Lu Baolu,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS,
open list:TEGRA ARCHITECTURE SUPPORT, open list
Cc: zhengkui_guo
Reviewed-by: Lyude Paul <lyude@redhat.com>
Will push to the appropriate branch in a moment
On Thu, 2022-05-19 at 15:29 +0800, Guo Zhengkui wrote:
> 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>
> ---
> drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
> b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
> index 2ed528c065fa..ac9e122586bc 100644
> --- 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);
>
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-23 20:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-19 7:29 [PATCH] drm/nouveau/tegra: remove needless NULL check Guo Zhengkui
2022-05-23 20:11 ` Lyude Paul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).