drivers: Drop inline from driver remove wrapper

The driver remove function is a function pointer and therefore, it does not make sense to define the function as an 'inline'. Update the coccinelle script and drivers to remove the inline statement. Bug 4749580 Change-Id: Ia03691b75c4edffe609f27468b911a92a5ddbd68 Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3233980 Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
2025-12-22 09:11:26 +03:00 · 2024-10-21 13:08:36 +01:00
parent 96dd1cf2ee
commit f01227d4ea
94 changed files with 190 additions and 190 deletions
--- a/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c
+++ b/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c
@@ -853,12 +853,12 @@ MODULE_DEVICE_TABLE(of, tegra_hv_vblk_oops_match);
 #endif /* CONFIG_OF */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_vblk_oops_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_vblk_oops_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_vblk_oops_remove(pdev);
 }
 #else
-static inline int tegra_hv_vblk_oops_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_vblk_oops_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_vblk_oops_remove(pdev);
 }
--- a/drivers/block/tegra_virt_storage/tegra_hv_vblk.c
+++ b/drivers/block/tegra_virt_storage/tegra_hv_vblk.c
@@ -1781,12 +1781,12 @@ MODULE_DEVICE_TABLE(of, tegra_hv_vblk_match);
 #endif /* CONFIG_OF */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_vblk_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_vblk_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_vblk_remove(pdev);
 }
 #else
-static inline int tegra_hv_vblk_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_vblk_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_vblk_remove(pdev);
 }
--- a/drivers/bus/tegra-aocluster.c
+++ b/drivers/bus/tegra-aocluster.c
@@ -35,12 +35,12 @@ static const struct of_device_id tegra_aocluster_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_aocluster_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_aocluster_remove_wrapper(struct platform_device *pdev)
+static void tegra_aocluster_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_aocluster_remove(pdev);
 }
 #else
-static inline int tegra_aocluster_remove_wrapper(struct platform_device *pdev)
+static int tegra_aocluster_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_aocluster_remove(pdev);
 }
--- a/drivers/cpuidle/cpuidle-tegra-auto.c
+++ b/drivers/cpuidle/cpuidle-tegra-auto.c
@@ -230,12 +230,12 @@ static const struct of_device_id tegra_auto_cpuidle_of[] = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_auto_cpuidle_remove_wrapper(struct platform_device *pdev)
+static void tegra_auto_cpuidle_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_auto_cpuidle_remove(pdev);
 }
 #else
-static inline int tegra_auto_cpuidle_remove_wrapper(struct platform_device *pdev)
+static int tegra_auto_cpuidle_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_auto_cpuidle_remove(pdev);
 }
--- a/drivers/crypto/tegra-hv-vse-safety.c
+++ b/drivers/crypto/tegra-hv-vse-safety.c
@@ -6300,12 +6300,12 @@ static const struct dev_pm_ops tegra_hv_pm_ops = {
 #endif /* CONFIG_PM */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_vse_safety_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_vse_safety_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_vse_safety_remove(pdev);
 }
 #else
-static inline int tegra_hv_vse_safety_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_vse_safety_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_vse_safety_remove(pdev);
 }
--- a/drivers/crypto/tegra-se-nvrng.c
+++ b/drivers/crypto/tegra-se-nvrng.c
@@ -360,12 +360,12 @@ static const struct of_device_id tegra_se_nvrng_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_se_nvrng_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_se_nvrng_remove_wrapper(struct platform_device *pdev)
+static void tegra_se_nvrng_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_se_nvrng_remove(pdev);
 }
 #else
-static inline int tegra_se_nvrng_remove_wrapper(struct platform_device *pdev)
+static int tegra_se_nvrng_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_se_nvrng_remove(pdev);
 }
--- a/drivers/crypto/tegra/tegra-se-main.c
+++ b/drivers/crypto/tegra/tegra-se-main.c
@@ -387,12 +387,12 @@ static const struct of_device_id tegra_se_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_se_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_se_remove_wrapper(struct platform_device *pdev)
+static void tegra_se_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_se_remove(pdev);
 }
 #else
-static inline int tegra_se_remove_wrapper(struct platform_device *pdev)
+static int tegra_se_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_se_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -3296,12 +3296,12 @@ static int tegra_dc_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_dc_remove_wrapper(struct platform_device *pdev)
+static void tegra_dc_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_dc_remove(pdev);
 }
 #else
-static inline int tegra_dc_remove_wrapper(struct platform_device *pdev)
+static int tegra_dc_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_dc_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/dpaux.c
+++ b/drivers/gpu/drm/tegra/dpaux.c
@@ -709,12 +709,12 @@ static const struct of_device_id tegra_dpaux_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_dpaux_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_dpaux_remove_wrapper(struct platform_device *pdev)
+static void tegra_dpaux_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_dpaux_remove(pdev);
 }
 #else
-static inline int tegra_dpaux_remove_wrapper(struct platform_device *pdev)
+static int tegra_dpaux_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_dpaux_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -1693,12 +1693,12 @@ static const struct of_device_id tegra_dsi_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_dsi_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_dsi_remove_wrapper(struct platform_device *pdev)
+static void tegra_dsi_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_dsi_remove(pdev);
 }
 #else
-static inline int tegra_dsi_remove_wrapper(struct platform_device *pdev)
+static int tegra_dsi_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_dsi_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -395,12 +395,12 @@ static const struct dev_pm_ops tegra_gr2d_pm = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void gr2d_remove_wrapper(struct platform_device *pdev)
+static void gr2d_remove_wrapper(struct platform_device *pdev)
 {
 	gr2d_remove(pdev);
 }
 #else
-static inline int gr2d_remove_wrapper(struct platform_device *pdev)
+static int gr2d_remove_wrapper(struct platform_device *pdev)
 {
 	return gr2d_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -634,12 +634,12 @@ static const struct dev_pm_ops tegra_gr3d_pm = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void gr3d_remove_wrapper(struct platform_device *pdev)
+static void gr3d_remove_wrapper(struct platform_device *pdev)
 {
 	gr3d_remove(pdev);
 }
 #else
-static inline int gr3d_remove_wrapper(struct platform_device *pdev)
+static int gr3d_remove_wrapper(struct platform_device *pdev)
 {
 	return gr3d_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1910,12 +1910,12 @@ static int tegra_hdmi_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hdmi_remove_wrapper(struct platform_device *pdev)
+static void tegra_hdmi_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hdmi_remove(pdev);
 }
 #else
-static inline int tegra_hdmi_remove_wrapper(struct platform_device *pdev)
+static int tegra_hdmi_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hdmi_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/hub.c
+++ b/drivers/gpu/drm/tegra/hub.c
@@ -1218,12 +1218,12 @@ static const struct of_device_id tegra_display_hub_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_display_hub_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_display_hub_remove_wrapper(struct platform_device *pdev)
+static void tegra_display_hub_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_display_hub_remove(pdev);
 }
 #else
-static inline int tegra_display_hub_remove_wrapper(struct platform_device *pdev)
+static int tegra_display_hub_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_display_hub_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/nvdec.c
+++ b/drivers/gpu/drm/tegra/nvdec.c
@@ -967,12 +967,12 @@ static const struct dev_pm_ops nvdec_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvdec_remove_wrapper(struct platform_device *pdev)
+static void nvdec_remove_wrapper(struct platform_device *pdev)
 {
 	nvdec_remove(pdev);
 }
 #else
-static inline int nvdec_remove_wrapper(struct platform_device *pdev)
+static int nvdec_remove_wrapper(struct platform_device *pdev)
 {
 	return nvdec_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/nvenc.c
+++ b/drivers/gpu/drm/tegra/nvenc.c
@@ -795,12 +795,12 @@ static const struct dev_pm_ops nvenc_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvenc_remove_wrapper(struct platform_device *pdev)
+static void nvenc_remove_wrapper(struct platform_device *pdev)
 {
 	nvenc_remove(pdev);
 }
 #else
-static inline int nvenc_remove_wrapper(struct platform_device *pdev)
+static int nvenc_remove_wrapper(struct platform_device *pdev)
 {
 	return nvenc_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/nvjpg.c
+++ b/drivers/gpu/drm/tegra/nvjpg.c
@@ -749,12 +749,12 @@ static const struct dev_pm_ops nvjpg_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvjpg_remove_wrapper(struct platform_device *pdev)
+static void nvjpg_remove_wrapper(struct platform_device *pdev)
 {
 	nvjpg_remove(pdev);
 }
 #else
-static inline int nvjpg_remove_wrapper(struct platform_device *pdev)
+static int nvjpg_remove_wrapper(struct platform_device *pdev)
 {
 	return nvjpg_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/ofa.c
+++ b/drivers/gpu/drm/tegra/ofa.c
@@ -669,12 +669,12 @@ static const struct dev_pm_ops ofa_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void ofa_remove_wrapper(struct platform_device *pdev)
+static void ofa_remove_wrapper(struct platform_device *pdev)
 {
 	ofa_remove(pdev);
 }
 #else
-static inline int ofa_remove_wrapper(struct platform_device *pdev)
+static int ofa_remove_wrapper(struct platform_device *pdev)
 {
 	return ofa_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -4083,12 +4083,12 @@ static const struct dev_pm_ops tegra_sor_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_sor_remove_wrapper(struct platform_device *pdev)
+static void tegra_sor_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_sor_remove(pdev);
 }
 #else
-static inline int tegra_sor_remove_wrapper(struct platform_device *pdev)
+static int tegra_sor_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_sor_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -869,12 +869,12 @@ static const struct dev_pm_ops vic_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void vic_remove_wrapper(struct platform_device *pdev)
+static void vic_remove_wrapper(struct platform_device *pdev)
 {
 	vic_remove(pdev);
 }
 #else
-static inline int vic_remove_wrapper(struct platform_device *pdev)
+static int vic_remove_wrapper(struct platform_device *pdev)
 {
 	return vic_remove(pdev);
 }
--- a/drivers/gpu/drm/tegra/virt.c
+++ b/drivers/gpu/drm/tegra/virt.c
@@ -843,12 +843,12 @@ static const struct dev_pm_ops virt_engine_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void virt_engine_remove_wrapper(struct platform_device *pdev)
+static void virt_engine_remove_wrapper(struct platform_device *pdev)
 {
 	virt_engine_remove(pdev);
 }
 #else
-static inline int virt_engine_remove_wrapper(struct platform_device *pdev)
+static int virt_engine_remove_wrapper(struct platform_device *pdev)
 {
 	return virt_engine_remove(pdev);
 }
--- a/drivers/gpu/host1x-emu/dev.c
+++ b/drivers/gpu/host1x-emu/dev.c
@@ -349,12 +349,12 @@ static const struct dev_pm_ops host1x_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void host1x_remove_wrapper(struct platform_device *pdev)
+static void host1x_remove_wrapper(struct platform_device *pdev)
 {
    host1x_remove(pdev);
 }
 #else
-static inline int host1x_remove_wrapper(struct platform_device *pdev)
+static int host1x_remove_wrapper(struct platform_device *pdev)
 {
    return host1x_remove(pdev);
 }
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -1103,12 +1103,12 @@ static const struct dev_pm_ops host1x_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void host1x_remove_wrapper(struct platform_device *pdev)
+static void host1x_remove_wrapper(struct platform_device *pdev)
 {
 	host1x_remove(pdev);
 }
 #else
-static inline int host1x_remove_wrapper(struct platform_device *pdev)
+static int host1x_remove_wrapper(struct platform_device *pdev)
 {
 	return host1x_remove(pdev);
 }
--- a/drivers/gpu/host1x/mipi.c
+++ b/drivers/gpu/host1x/mipi.c
@@ -549,12 +549,12 @@ static int tegra_mipi_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_mipi_remove_wrapper(struct platform_device *pdev)
+static void tegra_mipi_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_mipi_remove(pdev);
 }
 #else
-static inline int tegra_mipi_remove_wrapper(struct platform_device *pdev)
+static int tegra_mipi_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_mipi_remove(pdev);
 }
--- a/drivers/i2c/busses/i2c-tegra-slave-byte.c
+++ b/drivers/i2c/busses/i2c-tegra-slave-byte.c
@@ -446,12 +446,12 @@ static const struct of_device_id tegra_i2cslv_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_i2cslv_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_i2cslv_remove_wrapper(struct platform_device *pdev)
+static void tegra_i2cslv_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_i2cslv_remove(pdev);
 }
 #else
-static inline int tegra_i2cslv_remove_wrapper(struct platform_device *pdev)
+static int tegra_i2cslv_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_i2cslv_remove(pdev);
 }
--- a/drivers/media/platform/tegra/cam_fsync/cam_fsync.c
+++ b/drivers/media/platform/tegra/cam_fsync/cam_fsync.c
@@ -1438,12 +1438,12 @@ MODULE_DEVICE_TABLE(of, cam_fsync_of_match);
 static SIMPLE_DEV_PM_OPS(cam_fsync_pm, cam_fsync_suspend, cam_fsync_resume);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void cam_fsync_remove_wrapper(struct platform_device *pdev)
+static void cam_fsync_remove_wrapper(struct platform_device *pdev)
 {
 	cam_fsync_remove(pdev);
 }
 #else
-static inline int cam_fsync_remove_wrapper(struct platform_device *pdev)
+static int cam_fsync_remove_wrapper(struct platform_device *pdev)
 {
 	return cam_fsync_remove(pdev);
 }
--- a/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c
+++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-isp.c
@@ -2127,12 +2127,12 @@ static const struct of_device_id capture_isp_of_match[] = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void capture_isp_remove_wrapper(struct platform_device *pdev)
+static void capture_isp_remove_wrapper(struct platform_device *pdev)
 {
 	capture_isp_remove(pdev);
 }
 #else
-static inline int capture_isp_remove_wrapper(struct platform_device *pdev)
+static int capture_isp_remove_wrapper(struct platform_device *pdev)
 {
 	return capture_isp_remove(pdev);
 }
--- a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c
+++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c
@@ -1729,12 +1729,12 @@ static const struct of_device_id capture_vi_of_match[] = {
 MODULE_DEVICE_TABLE(of, capture_vi_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void capture_vi_remove_wrapper(struct platform_device *pdev)
+static void capture_vi_remove_wrapper(struct platform_device *pdev)
 {
 	capture_vi_remove(pdev);
 }
 #else
-static inline int capture_vi_remove_wrapper(struct platform_device *pdev)
+static int capture_vi_remove_wrapper(struct platform_device *pdev)
 {
 	return capture_vi_remove(pdev);
 }
--- a/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c
+++ b/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c
@@ -650,12 +650,12 @@ MODULE_DEVICE_TABLE(of, cdi_tsc_of_match);
 static SIMPLE_DEV_PM_OPS(cdi_tsc_pm, cdi_tsc_suspend, cdi_tsc_resume);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void cdi_tsc_remove_wrapper(struct platform_device *pdev)
+static void cdi_tsc_remove_wrapper(struct platform_device *pdev)
 {
 	cdi_tsc_remove(pdev);
 }
 #else
-static inline int cdi_tsc_remove_wrapper(struct platform_device *pdev)
+static int cdi_tsc_remove_wrapper(struct platform_device *pdev)
 {
 	return cdi_tsc_remove(pdev);
 }
--- a/drivers/media/platform/tegra/cdi/cdi_gpio.c
+++ b/drivers/media/platform/tegra/cdi/cdi_gpio.c
@@ -331,12 +331,12 @@ static const struct of_device_id cdi_gpio_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, cdi_gpio_dt_ids);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void cdi_gpio_remove_wrapper(struct platform_device *pdev)
+static void cdi_gpio_remove_wrapper(struct platform_device *pdev)
 {
 	cdi_gpio_remove(pdev);
 }
 #else
-static inline int cdi_gpio_remove_wrapper(struct platform_device *pdev)
+static int cdi_gpio_remove_wrapper(struct platform_device *pdev)
 {
 	return cdi_gpio_remove(pdev);
 }
--- a/drivers/media/platform/tegra/cdi/cdi_mgr.c
+++ b/drivers/media/platform/tegra/cdi/cdi_mgr.c
@@ -2051,12 +2051,12 @@ static const struct of_device_id cdi_mgr_of_match[] = {
 MODULE_DEVICE_TABLE(of, cdi_mgr_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void cdi_mgr_remove_wrapper(struct platform_device *pdev)
+static void cdi_mgr_remove_wrapper(struct platform_device *pdev)
 {
 	cdi_mgr_remove(pdev);
 }
 #else
-static inline int cdi_mgr_remove_wrapper(struct platform_device *pdev)
+static int cdi_mgr_remove_wrapper(struct platform_device *pdev)
 {
 	return cdi_mgr_remove(pdev);
 }
--- a/drivers/media/platform/tegra/cdi/cdi_pwm.c
+++ b/drivers/media/platform/tegra/cdi/cdi_pwm.c
@@ -254,12 +254,12 @@ static const struct dev_pm_ops cdi_pwm_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void cdi_pwm_remove_wrapper(struct platform_device *pdev)
+static void cdi_pwm_remove_wrapper(struct platform_device *pdev)
 {
 	cdi_pwm_remove(pdev);
 }
 #else
-static inline int cdi_pwm_remove_wrapper(struct platform_device *pdev)
+static int cdi_pwm_remove_wrapper(struct platform_device *pdev)
 {
 	return cdi_pwm_remove(pdev);
 }
--- a/drivers/media/platform/tegra/isc/isc_gpio.c
+++ b/drivers/media/platform/tegra/isc/isc_gpio.c
@@ -331,12 +331,12 @@ static const struct of_device_id isc_gpio_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, isc_gpio_dt_ids);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void isc_gpio_remove_wrapper(struct platform_device *pdev)
+static void isc_gpio_remove_wrapper(struct platform_device *pdev)
 {
 	isc_gpio_remove(pdev);
 }
 #else
-static inline int isc_gpio_remove_wrapper(struct platform_device *pdev)
+static int isc_gpio_remove_wrapper(struct platform_device *pdev)
 {
 	return isc_gpio_remove(pdev);
 }
--- a/drivers/media/platform/tegra/isc/isc_mgr.c
+++ b/drivers/media/platform/tegra/isc/isc_mgr.c
@@ -1205,12 +1205,12 @@ static const struct of_device_id isc_mgr_of_match[] = {
 MODULE_DEVICE_TABLE(of, isc_mgr_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void isc_mgr_remove_wrapper(struct platform_device *pdev)
+static void isc_mgr_remove_wrapper(struct platform_device *pdev)
 {
 	isc_mgr_remove(pdev);
 }
 #else
-static inline int isc_mgr_remove_wrapper(struct platform_device *pdev)
+static int isc_mgr_remove_wrapper(struct platform_device *pdev)
 {
 	return isc_mgr_remove(pdev);
 }
--- a/drivers/media/platform/tegra/isc/isc_pwm.c
+++ b/drivers/media/platform/tegra/isc/isc_pwm.c
@@ -254,12 +254,12 @@ static const struct dev_pm_ops isc_pwm_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void isc_pwm_remove_wrapper(struct platform_device *pdev)
+static void isc_pwm_remove_wrapper(struct platform_device *pdev)
 {
 	isc_pwm_remove(pdev);
 }
 #else
-static inline int isc_pwm_remove_wrapper(struct platform_device *pdev)
+static int isc_pwm_remove_wrapper(struct platform_device *pdev)
 {
 	return isc_pwm_remove(pdev);
 }
--- a/drivers/misc/bluedroid_pm.c
+++ b/drivers/misc/bluedroid_pm.c
@@ -592,12 +592,12 @@ static struct of_device_id bdroid_of_match[] = {
 MODULE_DEVICE_TABLE(of, bdroid_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void bluedroid_pm_remove_wrapper(struct platform_device *pdev)
+static void bluedroid_pm_remove_wrapper(struct platform_device *pdev)
 {
 	bluedroid_pm_remove(pdev);
 }
 #else
-static inline int bluedroid_pm_remove_wrapper(struct platform_device *pdev)
+static int bluedroid_pm_remove_wrapper(struct platform_device *pdev)
 {
 	return bluedroid_pm_remove(pdev);
 }
--- a/drivers/misc/nvsciipc/nvsciipc.c
+++ b/drivers/misc/nvsciipc/nvsciipc.c
@@ -834,12 +834,12 @@ exit:
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvsciipc_remove_wrapper(struct platform_device *pdev)
+static void nvsciipc_remove_wrapper(struct platform_device *pdev)
 {
 	nvsciipc_remove(pdev);
 }
 #else
-static inline int nvsciipc_remove_wrapper(struct platform_device *pdev)
+static int nvsciipc_remove_wrapper(struct platform_device *pdev)
 {
 	return nvsciipc_remove(pdev);
 }
--- a/drivers/mtd/devices/tegra_hv_mtd.c
+++ b/drivers/mtd/devices/tegra_hv_mtd.c
@@ -729,12 +729,12 @@ MODULE_DEVICE_TABLE(of, tegra_virt_mtd_match);
 #endif /* CONFIG_OF */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_virt_mtd_remove_wrapper(struct platform_device *pdev)
+static void tegra_virt_mtd_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_virt_mtd_remove(pdev);
 }
 #else
-static inline int tegra_virt_mtd_remove_wrapper(struct platform_device *pdev)
+static int tegra_virt_mtd_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_virt_mtd_remove(pdev);
 }
--- a/drivers/net/can/mttcan/native/m_ttcan_linux.c
+++ b/drivers/net/can/mttcan/native/m_ttcan_linux.c
@@ -1986,12 +1986,12 @@ static int mttcan_resume(struct platform_device *pdev)
 #endif

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void mttcan_remove_wrapper(struct platform_device *pdev)
+static void mttcan_remove_wrapper(struct platform_device *pdev)
 {
 	mttcan_remove(pdev);
 }
 #else
-static inline int mttcan_remove_wrapper(struct platform_device *pdev)
+static int mttcan_remove_wrapper(struct platform_device *pdev)
 {
 	return mttcan_remove(pdev);
 }
--- a/drivers/net/ethernet/mft/misc_drivers/bf3_livefish/bf3_livefish.c
+++ b/drivers/net/ethernet/mft/misc_drivers/bf3_livefish/bf3_livefish.c
@@ -340,12 +340,12 @@ static const struct acpi_device_id livefish_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, livefish_acpi_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void livefish_remove_wrapper(struct platform_device *pdev)
+static void livefish_remove_wrapper(struct platform_device *pdev)
 {
    livefish_remove(pdev);
 }
 #else
-static inline int livefish_remove_wrapper(struct platform_device *pdev)
+static int livefish_remove_wrapper(struct platform_device *pdev)
 {
    return livefish_remove(pdev);
 }
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
@@ -7952,12 +7952,12 @@ static const struct of_device_id ether_of_match[] = {
 MODULE_DEVICE_TABLE(of, ether_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void ether_remove_wrapper(struct platform_device *pdev)
+static void ether_remove_wrapper(struct platform_device *pdev)
 {
 	ether_remove(pdev);
 }
 #else
-static inline int ether_remove_wrapper(struct platform_device *pdev)
+static int ether_remove_wrapper(struct platform_device *pdev)
 {
 	return ether_remove(pdev);
 }
--- a/drivers/nvpmodel/nvpmodel-clk-cap.c
+++ b/drivers/nvpmodel/nvpmodel-clk-cap.c
@@ -266,12 +266,12 @@ static int nvpmodel_clk_cap_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvpmodel_clk_cap_remove_wrapper(struct platform_device *pdev)
+static void nvpmodel_clk_cap_remove_wrapper(struct platform_device *pdev)
 {
 	nvpmodel_clk_cap_remove(pdev);
 }
 #else
-static inline int nvpmodel_clk_cap_remove_wrapper(struct platform_device *pdev)
+static int nvpmodel_clk_cap_remove_wrapper(struct platform_device *pdev)
 {
 	return nvpmodel_clk_cap_remove(pdev);
 }
--- a/drivers/nvpps/nvpps_main.c
+++ b/drivers/nvpps/nvpps_main.c
@@ -1375,12 +1375,12 @@ MODULE_DEVICE_TABLE(of, nvpps_of_table);


 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvpps_remove_wrapper(struct platform_device *pdev)
+static void nvpps_remove_wrapper(struct platform_device *pdev)
 {
 	nvpps_remove(pdev);
 }
 #else
-static inline int nvpps_remove_wrapper(struct platform_device *pdev)
+static int nvpps_remove_wrapper(struct platform_device *pdev)
 {
 	return nvpps_remove(pdev);
 }
--- a/drivers/pci/controller/pcie-tegra-vf.c
+++ b/drivers/pci/controller/pcie-tegra-vf.c
@@ -145,12 +145,12 @@ static const struct of_device_id pci_tegra_vf_of_match[] = {
 MODULE_DEVICE_TABLE(of, pci_tegra_vf_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void pci_tegra_vf_remove_wrapper(struct platform_device *pdev)
+static void pci_tegra_vf_remove_wrapper(struct platform_device *pdev)
 {
 	pci_tegra_vf_remove(pdev);
 }
 #else
-static inline int pci_tegra_vf_remove_wrapper(struct platform_device *pdev)
+static int pci_tegra_vf_remove_wrapper(struct platform_device *pdev)
 {
 	return pci_tegra_vf_remove(pdev);
 }
--- a/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c
+++ b/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c
@@ -115,12 +115,12 @@ static const struct of_device_id tegra_aon_ivc_echo_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_aon_ivc_echo_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_aon_ivc_echo_remove_wrapper(struct platform_device *pdev)
+static void tegra_aon_ivc_echo_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_aon_ivc_echo_remove(pdev);
 }
 #else
-static inline int tegra_aon_ivc_echo_remove_wrapper(struct platform_device *pdev)
+static int tegra_aon_ivc_echo_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_aon_ivc_echo_remove(pdev);
 }
--- a/drivers/platform/tegra/aon/tegra-aon-module.c
+++ b/drivers/platform/tegra/aon/tegra-aon-module.c
@@ -164,12 +164,12 @@ static const struct of_device_id tegra_aon_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_aon_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_aon_remove_wrapper(struct platform_device *pdev)
+static void tegra_aon_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_aon_remove(pdev);
 }
 #else
-static inline int tegra_aon_remove_wrapper(struct platform_device *pdev)
+static int tegra_aon_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_aon_remove(pdev);
 }
--- a/drivers/platform/tegra/dce/dce-module.c
+++ b/drivers/platform/tegra/dce/dce-module.c
@@ -321,12 +321,12 @@ static const struct dev_pm_ops dce_pm_ops = {
 #endif

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_dce_remove_wrapper(struct platform_device *pdev)
+static void tegra_dce_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_dce_remove(pdev);
 }
 #else
-static inline int tegra_dce_remove_wrapper(struct platform_device *pdev)
+static int tegra_dce_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_dce_remove(pdev);
 }
--- a/drivers/platform/tegra/mc-hwpm.c
+++ b/drivers/platform/tegra/mc-hwpm.c
@@ -148,12 +148,12 @@ static int tegra_mc_hwpm_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_mc_hwpm_remove_wrapper(struct platform_device *pdev)
+static void tegra_mc_hwpm_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_mc_hwpm_remove(pdev);
 }
 #else
-static inline int tegra_mc_hwpm_remove_wrapper(struct platform_device *pdev)
+static int tegra_mc_hwpm_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_mc_hwpm_remove(pdev);
 }
--- a/drivers/platform/tegra/mce/tegra23x-mce.c
+++ b/drivers/platform/tegra/mce/tegra23x-mce.c
@@ -583,12 +583,12 @@ static const struct of_device_id t23x_mce_of_match[] = {
 MODULE_DEVICE_TABLE(of, t23x_mce_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void t23x_mce_remove_wrapper(struct platform_device *pdev)
+static void t23x_mce_remove_wrapper(struct platform_device *pdev)
 {
 	t23x_mce_remove(pdev);
 }
 #else
-static inline int t23x_mce_remove_wrapper(struct platform_device *pdev)
+static int t23x_mce_remove_wrapper(struct platform_device *pdev)
 {
 	return t23x_mce_remove(pdev);
 }
--- a/drivers/platform/tegra/nvadsp/dev.c
+++ b/drivers/platform/tegra/nvadsp/dev.c
@@ -651,12 +651,12 @@ static const struct of_device_id nvadsp_of_match[] = {
 MODULE_DEVICE_TABLE(of, nvadsp_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvadsp_remove_wrapper(struct platform_device *pdev)
+static void nvadsp_remove_wrapper(struct platform_device *pdev)
 {
 	nvadsp_remove(pdev);
 }
 #else
-static inline int nvadsp_remove_wrapper(struct platform_device *pdev)
+static int nvadsp_remove_wrapper(struct platform_device *pdev)
 {
 	return nvadsp_remove(pdev);
 }
--- a/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c
+++ b/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c
@@ -298,12 +298,12 @@ MODULE_DEVICE_TABLE(acpi, tegra23x_psc_acpi_match);
 #endif

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra234_psc_remove_wrapper(struct platform_device *pdev)
+static void tegra234_psc_remove_wrapper(struct platform_device *pdev)
 {
 	tegra234_psc_remove(pdev);
 }
 #else
-static inline int tegra234_psc_remove_wrapper(struct platform_device *pdev)
+static int tegra234_psc_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra234_psc_remove(pdev);
 }
--- a/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
+++ b/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c
@@ -1042,12 +1042,12 @@ static const struct dev_pm_ops tegra_cam_rtcpu_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_cam_rtcpu_remove_wrapper(struct platform_device *pdev)
+static void tegra_cam_rtcpu_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_cam_rtcpu_remove(pdev);
 }
 #else
-static inline int tegra_cam_rtcpu_remove_wrapper(struct platform_device *pdev)
+static int tegra_cam_rtcpu_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_cam_rtcpu_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra-cactmon-mc-all.c
+++ b/drivers/platform/tegra/tegra-cactmon-mc-all.c
@@ -141,12 +141,12 @@ static const struct of_device_id central_actmon_of_match[] = {
 MODULE_DEVICE_TABLE(of, central_actmon_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void central_actmon_remove_wrapper(struct platform_device *pdev)
+static void central_actmon_remove_wrapper(struct platform_device *pdev)
 {
 	central_actmon_remove(pdev);
 }
 #else
-static inline int central_actmon_remove_wrapper(struct platform_device *pdev)
+static int central_actmon_remove_wrapper(struct platform_device *pdev)
 {
 	return central_actmon_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra-fsicom.c
+++ b/drivers/platform/tegra/tegra-fsicom.c
@@ -464,12 +464,12 @@ static int __maybe_unused fsicom_client_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(fsicom_client_pm, fsicom_client_suspend, fsicom_client_resume);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void fsicom_client_remove_wrapper(struct platform_device *pdev)
+static void fsicom_client_remove_wrapper(struct platform_device *pdev)
 {
 	fsicom_client_remove(pdev);
 }
 #else
-static inline int fsicom_client_remove_wrapper(struct platform_device *pdev)
+static int fsicom_client_remove_wrapper(struct platform_device *pdev)
 {
 	return fsicom_client_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra-hv-xhci-debug.c
+++ b/drivers/platform/tegra/tegra-hv-xhci-debug.c
@@ -334,12 +334,12 @@ MODULE_DEVICE_TABLE(of, tegra_hv_xhci_debug_match);
 #endif /* CONFIG_OF */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_xhci_debug_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_xhci_debug_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_xhci_debug_remove(pdev);
 }
 #else
-static inline int tegra_hv_xhci_debug_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_xhci_debug_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_xhci_debug_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra-hv-xhci.c
+++ b/drivers/platform/tegra/tegra-hv-xhci.c
@@ -255,12 +255,12 @@ MODULE_DEVICE_TABLE(of, tegra_hv_xhci_match);
 #endif /* CONFIG_OF */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_xhci_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_xhci_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_xhci_remove(pdev);
 }
 #else
-static inline int tegra_hv_xhci_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_xhci_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_xhci_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra-uss-io-proxy.c
+++ b/drivers/platform/tegra/tegra-uss-io-proxy.c
@@ -499,12 +499,12 @@ static int tegra_uss_io_proxy_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_uss_io_proxy_remove_wrapper(struct platform_device *pdev)
+static void tegra_uss_io_proxy_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_uss_io_proxy_remove(pdev);
 }
 #else
-static inline int tegra_uss_io_proxy_remove_wrapper(struct platform_device *pdev)
+static int tegra_uss_io_proxy_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_uss_io_proxy_remove(pdev);
 }
--- a/drivers/platform/tegra/tegra_bootloader_debug.c
+++ b/drivers/platform/tegra/tegra_bootloader_debug.c
@@ -792,12 +792,12 @@ static const struct of_device_id tegra_bl_debug_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_bl_debug_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_bl_debug_remove_wrapper(struct platform_device *pdev)
+static void tegra_bl_debug_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_bl_debug_remove(pdev);
 }
 #else
-static inline int tegra_bl_debug_remove_wrapper(struct platform_device *pdev)
+static int tegra_bl_debug_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_bl_debug_remove(pdev);
 }
--- a/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c
+++ b/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c
@@ -624,12 +624,12 @@ static const struct of_device_id scf_pmu_of_device_ids[] = {
 MODULE_DEVICE_TABLE(of, scf_pmu_of_device_ids);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void scf_pmu_device_remove_wrapper(struct platform_device *pdev)
+static void scf_pmu_device_remove_wrapper(struct platform_device *pdev)
 {
 	scf_pmu_device_remove(pdev);
 }
 #else
-static inline int scf_pmu_device_remove_wrapper(struct platform_device *pdev)
+static int scf_pmu_device_remove_wrapper(struct platform_device *pdev)
 {
 	return scf_pmu_device_remove(pdev);
 }
--- a/drivers/pwm/pwm-tegra-tachometer.c
+++ b/drivers/pwm/pwm-tegra-tachometer.c
@@ -567,12 +567,12 @@ static const struct of_device_id pwm_tegra_tach_of_match[] = {
 MODULE_DEVICE_TABLE(of, pwm_tegra_tach_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void pwm_tegra_tach_remove_wrapper(struct platform_device *pdev)
+static void pwm_tegra_tach_remove_wrapper(struct platform_device *pdev)
 {
 	pwm_tegra_tach_remove(pdev);
 }
 #else
-static inline int pwm_tegra_tach_remove_wrapper(struct platform_device *pdev)
+static int pwm_tegra_tach_remove_wrapper(struct platform_device *pdev)
 {
 	return pwm_tegra_tach_remove(pdev);
 }
--- a/drivers/ras/arm64-ras.c
+++ b/drivers/ras/arm64-ras.c
@@ -492,12 +492,12 @@ static int ras_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void ras_remove_wrapper(struct platform_device *pdev)
+static void ras_remove_wrapper(struct platform_device *pdev)
 {
 	ras_remove(pdev);
 }
 #else
-static inline int ras_remove_wrapper(struct platform_device *pdev)
+static int ras_remove_wrapper(struct platform_device *pdev)
 {
 	return ras_remove(pdev);
 }
--- a/drivers/rtc/nvvrs-pseq-rtc.c
+++ b/drivers/rtc/nvvrs-pseq-rtc.c
@@ -523,12 +523,12 @@ static const struct platform_device_id nvvrs_rtc_id[] = {
 MODULE_DEVICE_TABLE(platform, nvvrs_rtc_id);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvvrs_rtc_remove_wrapper(struct platform_device *pdev)
+static void nvvrs_rtc_remove_wrapper(struct platform_device *pdev)
 {
 	nvvrs_rtc_remove(pdev);
 }
 #else
-static inline int nvvrs_rtc_remove_wrapper(struct platform_device *pdev)
+static int nvvrs_rtc_remove_wrapper(struct platform_device *pdev)
 {
 	return nvvrs_rtc_remove(pdev);
 }
--- a/drivers/rtc/rtc-max77851.c
+++ b/drivers/rtc/rtc-max77851.c
@@ -877,12 +877,12 @@ static const struct platform_device_id rtc_id[] = {
 MODULE_DEVICE_TABLE(platform, rtc_id);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void max77851_rtc_remove_wrapper(struct platform_device *pdev)
+static void max77851_rtc_remove_wrapper(struct platform_device *pdev)
 {
 	max77851_rtc_remove(pdev);
 }
 #else
-static inline int max77851_rtc_remove_wrapper(struct platform_device *pdev)
+static int max77851_rtc_remove_wrapper(struct platform_device *pdev)
 {
 	return max77851_rtc_remove(pdev);
 }
--- a/drivers/scsi/ufs/ufs-tegra-common.c
+++ b/drivers/scsi/ufs/ufs-tegra-common.c
@@ -2157,12 +2157,12 @@ static const struct dev_pm_ops ufs_tegra_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void ufs_tegra_remove_wrapper(struct platform_device *pdev)
+static void ufs_tegra_remove_wrapper(struct platform_device *pdev)
 {
 	ufs_tegra_remove(pdev);
 }
 #else
-static inline int ufs_tegra_remove_wrapper(struct platform_device *pdev)
+static int ufs_tegra_remove_wrapper(struct platform_device *pdev)
 {
 	return ufs_tegra_remove(pdev);
 }
--- a/drivers/soc/tegra/fuse/kfuse.c
+++ b/drivers/soc/tegra/fuse/kfuse.c
@@ -307,12 +307,12 @@ static const struct of_device_id tegra_kfuse_of_match[] = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_kfuse_remove_wrapper(struct platform_device *pdev)
+static void tegra_kfuse_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_kfuse_remove(pdev);
 }
 #else
-static inline int tegra_kfuse_remove_wrapper(struct platform_device *pdev)
+static int tegra_kfuse_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_kfuse_remove(pdev);
 }
--- a/drivers/spi/spi-tegra124-slave.c
+++ b/drivers/spi/spi-tegra124-slave.c
@@ -2275,12 +2275,12 @@ static const struct dev_pm_ops tegra_spi_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(tegra_spi_suspend, tegra_spi_resume)
 };
 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_spi_remove_wrapper(struct platform_device *pdev)
+static void tegra_spi_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_spi_remove(pdev);
 }
 #else
-static inline int tegra_spi_remove_wrapper(struct platform_device *pdev)
+static int tegra_spi_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_spi_remove(pdev);
 }
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -1867,12 +1867,12 @@ static const struct dev_pm_ops tegra_qspi_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_qspi_remove_wrapper(struct platform_device *pdev)
+static void tegra_qspi_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_qspi_remove(pdev);
 }
 #else
-static inline int tegra_qspi_remove_wrapper(struct platform_device *pdev)
+static int tegra_qspi_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_qspi_remove(pdev);
 }
--- a/drivers/thermal/tegra234-oc-event.c
+++ b/drivers/thermal/tegra234-oc-event.c
@@ -210,12 +210,12 @@ static int tegra234_oc_event_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra234_oc_event_remove_wrapper(struct platform_device *pdev)
+static void tegra234_oc_event_remove_wrapper(struct platform_device *pdev)
 {
 	tegra234_oc_event_remove(pdev);
 }
 #else
-static inline int tegra234_oc_event_remove_wrapper(struct platform_device *pdev)
+static int tegra234_oc_event_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra234_oc_event_remove(pdev);
 }
--- a/drivers/thermal/thermal-trip-event.c
+++ b/drivers/thermal/thermal-trip-event.c
@@ -242,12 +242,12 @@ static const struct of_device_id thermal_trip_event_of_match[] = {
 MODULE_DEVICE_TABLE(of, thermal_trip_event_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void thermal_trip_event_remove_wrapper(struct platform_device *pdev)
+static void thermal_trip_event_remove_wrapper(struct platform_device *pdev)
 {
 	thermal_trip_event_remove(pdev);
 }
 #else
-static inline int thermal_trip_event_remove_wrapper(struct platform_device *pdev)
+static int thermal_trip_event_remove_wrapper(struct platform_device *pdev)
 {
 	return thermal_trip_event_remove(pdev);
 }
--- a/drivers/video/tegra/camera/tegra_camera_platform.c
+++ b/drivers/video/tegra/camera/tegra_camera_platform.c
@@ -799,12 +799,12 @@ static int tegra_camera_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_camera_remove_wrapper(struct platform_device *pdev)
+static void tegra_camera_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_camera_remove(pdev);
 }
 #else
-static inline int tegra_camera_remove_wrapper(struct platform_device *pdev)
+static int tegra_camera_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_camera_remove(pdev);
 }
--- a/drivers/video/tegra/host/capture/capture-support.c
+++ b/drivers/video/tegra/host/capture/capture-support.c
@@ -203,12 +203,12 @@ static const struct of_device_id capture_support_match[] = {
 MODULE_DEVICE_TABLE(of, capture_support_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void capture_support_remove_wrapper(struct platform_device *pdev)
+static void capture_support_remove_wrapper(struct platform_device *pdev)
 {
 	capture_support_remove(pdev);
 }
 #else
-static inline int capture_support_remove_wrapper(struct platform_device *pdev)
+static int capture_support_remove_wrapper(struct platform_device *pdev)
 {
 	return capture_support_remove(pdev);
 }
--- a/drivers/video/tegra/host/isp/isp5.c
+++ b/drivers/video/tegra/host/isp/isp5.c
@@ -384,12 +384,12 @@ static const struct of_device_id tegra_isp5_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_isp5_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void isp5_remove_wrapper(struct platform_device *pdev)
+static void isp5_remove_wrapper(struct platform_device *pdev)
 {
 	isp5_remove(pdev);
 }
 #else
-static inline int isp5_remove_wrapper(struct platform_device *pdev)
+static int isp5_remove_wrapper(struct platform_device *pdev)
 {
 	return isp5_remove(pdev);
 }
--- a/drivers/video/tegra/host/nvcsi/nvcsi-t194.c
+++ b/drivers/video/tegra/host/nvcsi/nvcsi-t194.c
@@ -247,12 +247,12 @@ static int __exit t194_nvcsi_remove(struct platform_device *dev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void t194_nvcsi_remove_wrapper(struct platform_device *pdev)
+static void t194_nvcsi_remove_wrapper(struct platform_device *pdev)
 {
 	t194_nvcsi_remove(pdev);
 }
 #else
-static inline int t194_nvcsi_remove_wrapper(struct platform_device *pdev)
+static int t194_nvcsi_remove_wrapper(struct platform_device *pdev)
 {
 	return t194_nvcsi_remove(pdev);
 }
--- a/drivers/video/tegra/host/nvdla/nvdla.c
+++ b/drivers/video/tegra/host/nvdla/nvdla.c
@@ -1306,12 +1306,12 @@ const struct dev_pm_ops nvdla_module_pm_ops = {
 #endif /* CONFIG_PM */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void __exit nvdla_remove_wrapper(struct platform_device *pdev)
+static void __exit nvdla_remove_wrapper(struct platform_device *pdev)
 {
 	nvdla_remove(pdev);
 }
 #else
-static inline int __exit nvdla_remove_wrapper(struct platform_device *pdev)
+static int __exit nvdla_remove_wrapper(struct platform_device *pdev)
 {
 	return nvdla_remove(pdev);
 }
--- a/drivers/video/tegra/host/pva/pva.c
+++ b/drivers/video/tegra/host/pva/pva.c
@@ -1725,12 +1725,12 @@ const struct dev_pm_ops nvpva_module_pm_ops = {
 #endif /* CONFIG_PM */

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void __exit pva_remove_wrapper(struct platform_device *pdev)
+static void __exit pva_remove_wrapper(struct platform_device *pdev)
 {
 	pva_remove(pdev);
 }
 #else
-static inline int __exit pva_remove_wrapper(struct platform_device *pdev)
+static int __exit pva_remove_wrapper(struct platform_device *pdev)
 {
 	return pva_remove(pdev);
 }
--- a/drivers/video/tegra/host/pva/pva_iommu_context_dev.c
+++ b/drivers/video/tegra/host/pva/pva_iommu_context_dev.c
@@ -291,12 +291,12 @@ static int __exit pva_iommu_context_dev_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void __exit pva_iommu_context_dev_remove_wrapper(struct platform_device *pdev)
+static void __exit pva_iommu_context_dev_remove_wrapper(struct platform_device *pdev)
 {
 	pva_iommu_context_dev_remove(pdev);
 }
 #else
-static inline int __exit pva_iommu_context_dev_remove_wrapper(struct platform_device *pdev)
+static int __exit pva_iommu_context_dev_remove_wrapper(struct platform_device *pdev)
 {
 	return pva_iommu_context_dev_remove(pdev);
 }
--- a/drivers/video/tegra/host/vi/vi5.c
+++ b/drivers/video/tegra/host/vi/vi5.c
@@ -419,12 +419,12 @@ const struct dev_pm_ops vi_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void vi5_remove_wrapper(struct platform_device *pdev)
+static void vi5_remove_wrapper(struct platform_device *pdev)
 {
 	vi5_remove(pdev);
 }
 #else
-static inline int vi5_remove_wrapper(struct platform_device *pdev)
+static int vi5_remove_wrapper(struct platform_device *pdev)
 {
 	return vi5_remove(pdev);
 }
--- a/drivers/video/tegra/nvmap/nvmap_init.c
+++ b/drivers/video/tegra/nvmap/nvmap_init.c
@@ -455,12 +455,12 @@ static bool nvmap_is_carveout_node_present(void)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void nvmap_remove_wrapper(struct platform_device *pdev)
+static void nvmap_remove_wrapper(struct platform_device *pdev)
 {
 	nvmap_remove(pdev);
 }
 #else
-static inline int nvmap_remove_wrapper(struct platform_device *pdev)
+static int nvmap_remove_wrapper(struct platform_device *pdev)
 {
 	return nvmap_remove(pdev);
 }
--- a/drivers/video/tegra/tsec/tsec.c
+++ b/drivers/video/tegra/tsec/tsec.c
@@ -460,12 +460,12 @@ static int tsec_remove(struct platform_device *dev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tsec_remove_wrapper(struct platform_device *pdev)
+static void tsec_remove_wrapper(struct platform_device *pdev)
 {
 	tsec_remove(pdev);
 }
 #else
-static inline int tsec_remove_wrapper(struct platform_device *pdev)
+static int tsec_remove_wrapper(struct platform_device *pdev)
 {
 	return tsec_remove(pdev);
 }
--- a/drivers/virt/tegra/tegra_hv.c
+++ b/drivers/virt/tegra/tegra_hv.c
@@ -1037,12 +1037,12 @@ static const struct of_device_id tegra_hv_match[] = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_remove(pdev);
 }
 #else
-static inline int tegra_hv_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_remove(pdev);
 }
--- a/drivers/virt/tegra/tegra_hv_pm_ctl.c
+++ b/drivers/virt/tegra/tegra_hv_pm_ctl.c
@@ -1147,12 +1147,12 @@ static const struct of_device_id tegra_hv_pm_ctl_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_hv_pm_ctl_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_pm_ctl_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_pm_ctl_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_pm_ctl_remove(pdev);
 }
 #else
-static inline int tegra_hv_pm_ctl_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_pm_ctl_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_pm_ctl_remove(pdev);
 }
--- a/drivers/virt/tegra/tegra_hv_vcpu_yield.c
+++ b/drivers/virt/tegra/tegra_hv_vcpu_yield.c
@@ -459,12 +459,12 @@ static const struct of_device_id tegra_hv_vcpu_yield_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_hv_vcpu_yield_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_hv_vcpu_yield_remove_wrapper(struct platform_device *pdev)
+static void tegra_hv_vcpu_yield_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_hv_vcpu_yield_remove(pdev);
 }
 #else
-static inline int tegra_hv_vcpu_yield_remove_wrapper(struct platform_device *pdev)
+static int tegra_hv_vcpu_yield_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_hv_vcpu_yield_remove(pdev);
 }
--- a/drivers/watchdog/max77851_wdt.c
+++ b/drivers/watchdog/max77851_wdt.c
@@ -211,12 +211,12 @@ static struct platform_device_id max77851_wdt_devtype[] = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void max77851_wdt_remove_wrapper(struct platform_device *pdev)
+static void max77851_wdt_remove_wrapper(struct platform_device *pdev)
 {
 	max77851_wdt_remove(pdev);
 }
 #else
-static inline int max77851_wdt_remove_wrapper(struct platform_device *pdev)
+static int max77851_wdt_remove_wrapper(struct platform_device *pdev)
 {
 	return max77851_wdt_remove(pdev);
 }
--- a/drivers/watchdog/softdog-platform.c
+++ b/drivers/watchdog/softdog-platform.c
@@ -243,12 +243,12 @@ static struct of_device_id softdog_platform_of_match[] = {
 MODULE_DEVICE_TABLE(of, softdog_platform_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void softdog_platform_remove_wrapper(struct platform_device *pdev)
+static void softdog_platform_remove_wrapper(struct platform_device *pdev)
 {
 	softdog_platform_remove(pdev);
 }
 #else
-static inline int softdog_platform_remove_wrapper(struct platform_device *pdev)
+static int softdog_platform_remove_wrapper(struct platform_device *pdev)
 {
 	return softdog_platform_remove(pdev);
 }
--- a/drivers/watchdog/watchdog-tegra-t18x.c
+++ b/drivers/watchdog/watchdog-tegra-t18x.c
@@ -831,12 +831,12 @@ static const struct of_device_id tegra_wdt_t18x_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_wdt_t18x_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_wdt_t18x_remove_wrapper(struct platform_device *pdev)
+static void tegra_wdt_t18x_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_wdt_t18x_remove(pdev);
 }
 #else
-static inline int tegra_wdt_t18x_remove_wrapper(struct platform_device *pdev)
+static int tegra_wdt_t18x_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_wdt_t18x_remove(pdev);
 }
--- a/scripts/coccinelle/platform_driver_remove.cocci
+++ b/scripts/coccinelle/platform_driver_remove.cocci
@@ -26,12 +26,12 @@ identifier match1.removefn;
 fresh identifier removefn_wrapper = removefn ## "_wrapper";
@@
 +#if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-+static inline void removefn_wrapper(struct platform_device *pdev)
+static void removefn_wrapper(struct platform_device *pdev)
 +{
 +	removefn(pdev);
 +}
 +#else
-+static inline int removefn_wrapper(struct platform_device *pdev)
+static int removefn_wrapper(struct platform_device *pdev)
 +{
 +	return removefn(pdev);
 +}
@@ -48,12 +48,12 @@ identifier match2.removefn;
 fresh identifier removefn_wrapper = removefn ## "_wrapper";
@@
 +#if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-+static inline void removefn_wrapper(struct platform_device *pdev)
+static void removefn_wrapper(struct platform_device *pdev)
 +{
 +	removefn(pdev);
 +}
 +#else
-+static inline int removefn_wrapper(struct platform_device *pdev)
+static int removefn_wrapper(struct platform_device *pdev)
 +{
 +	return removefn(pdev);
 +}
--- a/sound/soc/tegra-virt-alt/tegra210_adsp_virt_alt.c
+++ b/sound/soc/tegra-virt-alt/tegra210_adsp_virt_alt.c
@@ -5371,12 +5371,12 @@ static const struct dev_pm_ops tegra210_adsp_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
+static void tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
 {
 	tegra210_adsp_audio_remove(pdev);
 }
 #else
-static inline int tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
+static int tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra210_adsp_audio_remove(pdev);
 }
--- a/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
+++ b/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c
@@ -253,12 +253,12 @@ static int tegra_virt_machine_driver_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_virt_machine_driver_remove_wrapper(struct platform_device *pdev)
+static void tegra_virt_machine_driver_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_virt_machine_driver_remove(pdev);
 }
 #else
-static inline int tegra_virt_machine_driver_remove_wrapper(struct platform_device *pdev)
+static int tegra_virt_machine_driver_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_virt_machine_driver_remove(pdev);
 }
--- a/sound/soc/tegra/tegra186_arad.c
+++ b/sound/soc/tegra/tegra186_arad.c
@@ -800,12 +800,12 @@ static const struct dev_pm_ops tegra186_arad_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra186_arad_platform_remove_wrapper(struct platform_device *pdev)
+static void tegra186_arad_platform_remove_wrapper(struct platform_device *pdev)
 {
 	tegra186_arad_platform_remove(pdev);
 }
 #else
-static inline int tegra186_arad_platform_remove_wrapper(struct platform_device *pdev)
+static int tegra186_arad_platform_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra186_arad_platform_remove(pdev);
 }
--- a/sound/soc/tegra/tegra210_adsp.c
+++ b/sound/soc/tegra/tegra210_adsp.c
@@ -4818,12 +4818,12 @@ static const struct dev_pm_ops tegra210_adsp_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
+static void tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
 {
 	tegra210_adsp_audio_remove(pdev);
 }
 #else
-static inline int tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
+static int tegra210_adsp_audio_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra210_adsp_audio_remove(pdev);
 }
--- a/sound/soc/tegra/tegra210_afc.c
+++ b/sound/soc/tegra/tegra210_afc.c
@@ -561,12 +561,12 @@ static const struct dev_pm_ops tegra210_afc_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra210_afc_platform_remove_wrapper(struct platform_device *pdev)
+static void tegra210_afc_platform_remove_wrapper(struct platform_device *pdev)
 {
 	tegra210_afc_platform_remove(pdev);
 }
 #else
-static inline int tegra210_afc_platform_remove_wrapper(struct platform_device *pdev)
+static int tegra210_afc_platform_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra210_afc_platform_remove(pdev);
 }
--- a/sound/soc/tegra/tegra210_iqc.c
+++ b/sound/soc/tegra/tegra210_iqc.c
@@ -347,12 +347,12 @@ static const struct dev_pm_ops tegra210_iqc_pm_ops = {
 };

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra210_iqc_platform_remove_wrapper(struct platform_device *pdev)
+static void tegra210_iqc_platform_remove_wrapper(struct platform_device *pdev)
 {
 	tegra210_iqc_platform_remove(pdev);
 }
 #else
-static inline int tegra210_iqc_platform_remove_wrapper(struct platform_device *pdev)
+static int tegra210_iqc_platform_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra210_iqc_platform_remove(pdev);
 }
--- a/sound/soc/tegra/tegra_mixer_control.c
+++ b/sound/soc/tegra/tegra_mixer_control.c
@@ -503,12 +503,12 @@ static const struct of_device_id tegra_mixer_control_of_match[] = {
 MODULE_DEVICE_TABLE(of, tegra_mixer_control_of_match);

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void tegra_mixer_control_remove_wrapper(struct platform_device *pdev)
+static void tegra_mixer_control_remove_wrapper(struct platform_device *pdev)
 {
 	tegra_mixer_control_remove(pdev);
 }
 #else
-static inline int tegra_mixer_control_remove_wrapper(struct platform_device *pdev)
+static int tegra_mixer_control_remove_wrapper(struct platform_device *pdev)
 {
 	return tegra_mixer_control_remove(pdev);
 }
--- a/sound/tegra-safety-audio/sound-card.c
+++ b/sound/tegra-safety-audio/sound-card.c
@@ -818,12 +818,12 @@ static int t234_safety_audio_remove(struct platform_device *pdev)
 }

 #if defined(NV_PLATFORM_DRIVER_STRUCT_REMOVE_RETURNS_VOID) /* Linux v6.11 */
-static inline void t234_safety_audio_remove_wrapper(struct platform_device *pdev)
+static void t234_safety_audio_remove_wrapper(struct platform_device *pdev)
 {
 	t234_safety_audio_remove(pdev);
 }
 #else
-static inline int t234_safety_audio_remove_wrapper(struct platform_device *pdev)
+static int t234_safety_audio_remove_wrapper(struct platform_device *pdev)
 {
 	return t234_safety_audio_remove(pdev);
 }