From d171c817ec12671a4a8834d044e01ba3d1dfab0f Mon Sep 17 00:00:00 2001 From: Johnny Liu Date: Thu, 3 Aug 2023 14:02:07 +0000 Subject: [PATCH] drm/tegra: Correct icc cleanup logic Since devm_of_icc_get is used, no need to call icc_put when device probe fails or device driver is removed. Bug 4222919 Signed-off-by: Johnny Liu Change-Id: Ide313c6f56e1bef83ffe3718cd434abbdaeec869 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2947933 Reviewed-by: svcacv Reviewed-by: Mikko Perttunen GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/nvdec.c | 3 --- drivers/gpu/drm/tegra/nvenc.c | 3 --- drivers/gpu/drm/tegra/nvjpg.c | 3 --- drivers/gpu/drm/tegra/vic.c | 3 --- 4 files changed, 12 deletions(-) diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index 02fa2dc4..645dad00 100644 --- a/drivers/gpu/drm/tegra/nvdec.c +++ b/drivers/gpu/drm/tegra/nvdec.c @@ -835,7 +835,6 @@ static int nvdec_probe(struct platform_device *pdev) exit_falcon: falcon_exit(&nvdec->falcon); - icc_put(nvdec->icc_write); return err; } @@ -863,8 +862,6 @@ static int nvdec_remove(struct platform_device *pdev) falcon_exit(&nvdec->falcon); - icc_put(nvdec->icc_write); - return 0; } diff --git a/drivers/gpu/drm/tegra/nvenc.c b/drivers/gpu/drm/tegra/nvenc.c index b24955d3..049571c4 100644 --- a/drivers/gpu/drm/tegra/nvenc.c +++ b/drivers/gpu/drm/tegra/nvenc.c @@ -701,7 +701,6 @@ static int nvenc_probe(struct platform_device *pdev) exit_falcon: falcon_exit(&nvenc->falcon); - icc_put(nvenc->icc_write); return err; } @@ -729,8 +728,6 @@ static int nvenc_remove(struct platform_device *pdev) falcon_exit(&nvenc->falcon); - icc_put(nvenc->icc_write); - return 0; } diff --git a/drivers/gpu/drm/tegra/nvjpg.c b/drivers/gpu/drm/tegra/nvjpg.c index eb476c71..a79564c1 100644 --- a/drivers/gpu/drm/tegra/nvjpg.c +++ b/drivers/gpu/drm/tegra/nvjpg.c @@ -688,7 +688,6 @@ static int nvjpg_probe(struct platform_device *pdev) exit_falcon: falcon_exit(&nvjpg->falcon); - icc_put(nvjpg->icc_write); return err; } @@ -716,8 +715,6 @@ static int nvjpg_remove(struct platform_device *pdev) falcon_exit(&nvjpg->falcon); - icc_put(nvjpg->icc_write); - return 0; } diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index dca653e6..1884a16b 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -770,7 +770,6 @@ static int vic_probe(struct platform_device *pdev) exit_falcon: falcon_exit(&vic->falcon); - icc_put(vic->icc_write); return err; } @@ -798,8 +797,6 @@ static int vic_remove(struct platform_device *pdev) falcon_exit(&vic->falcon); - icc_put(vic->icc_write); - return 0; }