diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c
index 685b3407..588f9d66 100644
--- a/drivers/misc/tegra-cec/tegra_cec.c
+++ b/drivers/misc/tegra-cec/tegra_cec.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2012-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
+#include <nvidia/conftest.h>
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
@@ -749,14 +751,12 @@ cec_error:
 	return ret;
 }
 
-static int tegra_cec_remove(struct platform_device *pdev)
+static void tegra_cec_remove(struct platform_device *pdev)
 {
 	struct tegra_cec *cec = platform_get_drvdata(pdev);
 
 	misc_deregister(&cec->misc_dev);
 	cancel_work_sync(&cec->work);
-
-	return 0;
 }
 
 #ifdef CONFIG_PM
@@ -803,6 +803,20 @@ static struct of_device_id tegra_cec_of_match[] = {
 	{},
 };
 
+#if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
+static void tegra_cec_remove_wrapper(struct platform_device *pdev)
+{
+	tegra_cec_remove(pdev);
+}
+#else
+static int tegra_cec_remove_wrapper(struct platform_device *pdev)
+{
+	tegra_cec_remove(pdev);
+
+	return 0;
+}
+#endif
+
 static struct platform_driver tegra_cec_driver = {
 	.driver = {
 		.name = TEGRA_CEC_NAME,
@@ -811,7 +825,7 @@ static struct platform_driver tegra_cec_driver = {
 		.of_match_table = of_match_ptr(tegra_cec_of_match),
 	},
 	.probe = tegra_cec_probe,
-	.remove = tegra_cec_remove,
+	.remove = tegra_cec_remove_wrapper,
 
 #ifdef CONFIG_PM
 	.suspend = tegra_cec_suspend,
@@ -823,4 +837,4 @@ module_platform_driver(tegra_cec_driver);
 
 MODULE_DESCRIPTION("Tegra CEC Driver");
 MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Prafull Suryawanshi <prafulls@nvidia.com>");
\ No newline at end of file
+MODULE_AUTHOR("Prafull Suryawanshi <prafulls@nvidia.com>");
diff --git a/drivers/misc/tegra-cec/tegra_cec.h b/drivers/misc/tegra-cec/tegra_cec.h
index 9a6ad409..c46708c8 100644
--- a/drivers/misc/tegra-cec/tegra_cec.h
+++ b/drivers/misc/tegra-cec/tegra_cec.h
@@ -39,7 +39,6 @@ struct tegra_cec {
 	u8			tx_buf_cnt;
 	struct reset_control    *reset;
 };
-static int tegra_cec_remove(struct platform_device *pdev);
 
 #define TEGRA_CEC_LADDR_BROADCAST   0xF
 #define TEGRA_CEC_LADDR_MASK        0xF