diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c
index ca3c1823..69963178 100644
--- a/drivers/gpu/drm/tegra/nvdec.c
+++ b/drivers/gpu/drm/tegra/nvdec.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2015-2023, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2015-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
  */
 
 #include <linux/bitops.h>
@@ -804,10 +804,9 @@ static int nvdec_probe(struct platform_device *pdev)
 	}
 
 	nvdec->icc_write = devm_of_icc_get(dev, "write");
-	if (IS_ERR(nvdec->icc_write)) {
-		dev_err(&pdev->dev, "failed to get icc write handle\n");
-		return PTR_ERR(nvdec->icc_write);
-	}
+	if (IS_ERR(nvdec->icc_write))
+		return dev_err_probe(&pdev->dev, PTR_ERR(nvdec->icc_write),
+				     "failed to get icc write handle\n");
 
 	platform_set_drvdata(pdev, nvdec);
 
diff --git a/drivers/gpu/drm/tegra/nvenc.c b/drivers/gpu/drm/tegra/nvenc.c
index 055c126b..a5605a72 100644
--- a/drivers/gpu/drm/tegra/nvenc.c
+++ b/drivers/gpu/drm/tegra/nvenc.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
  */
 
 #include <linux/bitops.h>
@@ -670,10 +670,9 @@ static int nvenc_probe(struct platform_device *pdev)
 		return err;
 
 	nvenc->icc_write = devm_of_icc_get(dev, "write");
-	if (IS_ERR(nvenc->icc_write)) {
-		dev_err(&pdev->dev, "failed to get icc write handle\n");
-		return PTR_ERR(nvenc->icc_write);
-	}
+	if (IS_ERR(nvenc->icc_write))
+		return dev_err_probe(&pdev->dev, PTR_ERR(nvenc->icc_write),
+				     "failed to get icc write handle\n");
 
 	platform_set_drvdata(pdev, nvenc);
 
diff --git a/drivers/gpu/drm/tegra/nvjpg.c b/drivers/gpu/drm/tegra/nvjpg.c
index 7d80306d..4e9528c5 100644
--- a/drivers/gpu/drm/tegra/nvjpg.c
+++ b/drivers/gpu/drm/tegra/nvjpg.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved.
  */
 
 #include <linux/bitops.h>
@@ -655,10 +655,9 @@ static int nvjpg_probe(struct platform_device *pdev)
 		return err;
 
 	nvjpg->icc_write = devm_of_icc_get(dev, "write");
-	if (IS_ERR(nvjpg->icc_write)) {
-		dev_err(&pdev->dev, "failed to get icc write handle\n");
-		return PTR_ERR(nvjpg->icc_write);
-	}
+	if (IS_ERR(nvjpg->icc_write))
+		return dev_err_probe(&pdev->dev, PTR_ERR(nvjpg->icc_write),
+				     "failed to get icc write handle\n");
 
 	platform_set_drvdata(pdev, nvjpg);
 
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index 3ed92ead..ada3dcd8 100644
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * SPDX-FileCopyrightText: Copyright (C) 2015-2023 NVIDIA CORPORATION.  All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (C) 2015-2024 NVIDIA CORPORATION.  All rights reserved.
  */
 
 #include <linux/bitops.h>
@@ -723,10 +723,9 @@ static int vic_probe(struct platform_device *pdev)
 	}
 
 	vic->icc_write = devm_of_icc_get(dev, "write");
-	if (IS_ERR(vic->icc_write)) {
-		dev_err(&pdev->dev, "failed to get icc write handle\n");
-		return PTR_ERR(vic->icc_write);
-	}
+	if (IS_ERR(vic->icc_write))
+		return dev_err_probe(&pdev->dev, PTR_ERR(vic->icc_write),
+				     "failed to get icc write handle\n");
 
 	if (!dev->pm_domain) {
 		vic->rst = devm_reset_control_get(dev, "vic");