From 74c0a6d16d10d531a6649f38a188f1eb4f6fd42a Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Mon, 21 Oct 2024 13:08:36 +0100 Subject: [PATCH] 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 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3233980 (cherry picked from commit 2c3a31c9b72785ee35ad079422b624f59a35f622) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3276870 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- .../block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c | 6 +++--- drivers/block/tegra_virt_storage/tegra_hv_vblk.c | 6 +++--- drivers/cpuidle/cpuidle-tegra-auto.c | 6 +++--- drivers/crypto/tegra-hv-vse-safety.c | 7 +++---- drivers/crypto/tegra-se-nvrng.c | 6 +++--- drivers/crypto/tegra/tegra-se-main.c | 6 +++--- drivers/gpu/drm/tegra/dc.c | 6 +++--- drivers/gpu/drm/tegra/dpaux.c | 6 +++--- drivers/gpu/drm/tegra/dsi.c | 6 +++--- drivers/gpu/drm/tegra/gr2d.c | 6 +++--- drivers/gpu/drm/tegra/gr3d.c | 6 +++--- drivers/gpu/drm/tegra/hdmi.c | 6 +++--- drivers/gpu/drm/tegra/hub.c | 6 +++--- drivers/gpu/drm/tegra/nvdec.c | 6 +++--- drivers/gpu/drm/tegra/nvenc.c | 6 +++--- drivers/gpu/drm/tegra/nvjpg.c | 6 +++--- drivers/gpu/drm/tegra/ofa.c | 6 +++--- drivers/gpu/drm/tegra/sor.c | 6 +++--- drivers/gpu/drm/tegra/vic.c | 6 +++--- drivers/gpu/drm/tegra/virt.c | 6 +++--- drivers/gpu/host1x/dev.c | 6 +++--- drivers/gpu/host1x/mipi.c | 6 +++--- drivers/media/platform/tegra/cam_fsync/cam_fsync.c | 6 +++--- .../platform/tegra/camera/fusa-capture/capture-vi.c | 6 +++--- drivers/media/platform/tegra/cdi/cam_cdi_tsc.c | 8 ++++---- drivers/media/platform/tegra/cdi/cdi_gpio.c | 6 +++--- drivers/media/platform/tegra/cdi/cdi_mgr.c | 6 +++--- drivers/media/platform/tegra/cdi/cdi_pwm.c | 6 +++--- drivers/media/platform/tegra/isc/isc_gpio.c | 6 +++--- drivers/media/platform/tegra/isc/isc_mgr.c | 6 +++--- drivers/media/platform/tegra/isc/isc_pwm.c | 6 +++--- drivers/misc/bluedroid_pm.c | 6 +++--- drivers/misc/nvsciipc/nvsciipc.c | 6 +++--- drivers/mtd/devices/tegra_hv_mtd.c | 6 +++--- drivers/net/can/mttcan/native/m_ttcan_linux.c | 6 +++--- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 6 +++--- drivers/nvpmodel/nvpmodel-clk-cap.c | 6 +++--- drivers/nvpps/nvpps_main.c | 6 +++--- drivers/pci/controller/pcie-tegra-vf.c | 6 +++--- drivers/platform/tegra/aon/tegra-aon-ivc-echo.c | 6 +++--- drivers/platform/tegra/aon/tegra-aon-module.c | 6 +++--- drivers/platform/tegra/dce/dce-module.c | 6 +++--- drivers/platform/tegra/mc-hwpm.c | 6 +++--- drivers/platform/tegra/mce/tegra23x-mce.c | 6 +++--- drivers/platform/tegra/nvadsp/dev.c | 6 +++--- drivers/platform/tegra/psc/tegra23x_psc_mailbox.c | 6 +++--- drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c | 6 +++--- drivers/platform/tegra/tegra-cactmon-mc-all.c | 6 +++--- drivers/platform/tegra/tegra-fsicom.c | 6 +++--- drivers/platform/tegra/tegra-uss-io-proxy.c | 6 +++--- drivers/platform/tegra/tegra_bootloader_debug.c | 6 +++--- .../platform/tegra/uncore_pmu/tegra23x_perf_uncore.c | 6 +++--- drivers/pwm/pwm-tegra-tachometer.c | 6 +++--- drivers/ras/arm64-ras.c | 6 +++--- drivers/rtc/nvvrs-pseq-rtc.c | 6 +++--- drivers/rtc/rtc-max77851.c | 6 +++--- drivers/scsi/ufs/ufs-tegra-common.c | 6 +++--- drivers/soc/tegra/fuse/kfuse.c | 6 +++--- drivers/spi/spi-tegra124-slave.c | 6 +++--- drivers/spi/spi-tegra210-quad.c | 6 +++--- drivers/thermal/tegra234-oc-event.c | 6 +++--- drivers/thermal/thermal-trip-event.c | 6 +++--- drivers/video/tegra/camera/tegra_camera_platform.c | 6 +++--- drivers/video/tegra/host/capture/capture-support.c | 6 +++--- drivers/video/tegra/host/isp/isp5.c | 6 +++--- drivers/video/tegra/host/nvcsi/nvcsi-t194.c | 6 +++--- drivers/video/tegra/host/nvdla/nvdla.c | 6 +++--- drivers/video/tegra/host/pva/pva.c | 6 +++--- drivers/video/tegra/host/pva/pva_iommu_context_dev.c | 6 +++--- drivers/video/tegra/host/vi/vi5.c | 6 +++--- drivers/video/tegra/nvmap/nvmap_init.c | 6 +++--- drivers/video/tegra/tsec/tsec.c | 6 +++--- drivers/virt/tegra/tegra_hv.c | 6 +++--- drivers/virt/tegra/tegra_hv_pm_ctl.c | 6 +++--- drivers/virt/tegra/tegra_hv_vcpu_yield.c | 6 +++--- drivers/watchdog/max77851_wdt.c | 6 +++--- drivers/watchdog/softdog-platform.c | 6 +++--- drivers/watchdog/watchdog-tegra-t18x.c | 6 +++--- scripts/coccinelle/platform_driver_remove.cocci | 10 +++++----- sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c | 6 +++--- sound/soc/tegra/tegra186_arad.c | 6 +++--- sound/soc/tegra/tegra210_adsp.c | 6 +++--- sound/soc/tegra/tegra210_afc.c | 6 +++--- sound/soc/tegra/tegra210_iqc.c | 6 +++--- sound/tegra-safety-audio/sound-card.c | 6 +++--- 85 files changed, 258 insertions(+), 259 deletions(-) diff --git a/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c b/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c index 64ce54ab..2cc2730f 100644 --- a/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c +++ b/drivers/block/tegra_oops_virt_storage/tegra_hv_vblk_oops.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -805,12 +805,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); } diff --git a/drivers/block/tegra_virt_storage/tegra_hv_vblk.c b/drivers/block/tegra_virt_storage/tegra_hv_vblk.c index aada66db..7186b125 100644 --- a/drivers/block/tegra_virt_storage/tegra_hv_vblk.c +++ b/drivers/block/tegra_virt_storage/tegra_hv_vblk.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1564,12 +1564,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); } diff --git a/drivers/cpuidle/cpuidle-tegra-auto.c b/drivers/cpuidle/cpuidle-tegra-auto.c index e0e93983..f2d95806 100644 --- a/drivers/cpuidle/cpuidle-tegra-auto.c +++ b/drivers/cpuidle/cpuidle-tegra-auto.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -229,12 +229,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); } diff --git a/drivers/crypto/tegra-hv-vse-safety.c b/drivers/crypto/tegra-hv-vse-safety.c index 1d9a81cd..07e5836c 100644 --- a/drivers/crypto/tegra-hv-vse-safety.c +++ b/drivers/crypto/tegra-hv-vse-safety.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* - * Copyright (c) 2019-2024, NVIDIA Corporation. All Rights Reserved. - * * Cryptographic API. */ @@ -5212,12 +5211,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); } diff --git a/drivers/crypto/tegra-se-nvrng.c b/drivers/crypto/tegra-se-nvrng.c index 15b34348..94f6da25 100644 --- a/drivers/crypto/tegra-se-nvrng.c +++ b/drivers/crypto/tegra-se-nvrng.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2020-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * Support for Tegra NVRNG Engine Error Handling. */ @@ -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); } diff --git a/drivers/crypto/tegra/tegra-se-main.c b/drivers/crypto/tegra/tegra-se-main.c index 2088f382..819b995b 100644 --- a/drivers/crypto/tegra/tegra-se-main.c +++ b/drivers/crypto/tegra/tegra-se-main.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * Crypto driver for NVIDIA Security Engine in Tegra Chips */ @@ -389,12 +389,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); } diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index dd00dab8..b73e8682 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2012 Avionic Design GmbH - * SPDX-FileCopyrightText: Copyright (c) 2012-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2012-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index 7b49cdde..5250fefa 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2013-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index e836ca59..5f326179 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2013-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c index 517588fd..b21f75f3 100644 --- a/drivers/gpu/drm/tegra/gr2d.c +++ b/drivers/gpu/drm/tegra/gr2d.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2012-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2012-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c index 6b5e6b7e..2405d23c 100644 --- a/drivers/gpu/drm/tegra/gr3d.c +++ b/drivers/gpu/drm/tegra/gr3d.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2013 Avionic Design GmbH - * SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2013-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index df27bc86..e7faab23 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2012 Avionic Design GmbH - * SPDX-FileCopyrightText: Copyright (c) 2012-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2012-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index f1cc761b..e923d228 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c index 0369099a..231f6cd8 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-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. + * SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/nvenc.c b/drivers/gpu/drm/tegra/nvenc.c index 9747b90e..8722bfdb 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-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -760,12 +760,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); } diff --git a/drivers/gpu/drm/tegra/nvjpg.c b/drivers/gpu/drm/tegra/nvjpg.c index 05406c39..8f0a9757 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 /* - * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -737,12 +737,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); } diff --git a/drivers/gpu/drm/tegra/ofa.c b/drivers/gpu/drm/tegra/ofa.c index 0554955c..7b5b08d7 100644 --- a/drivers/gpu/drm/tegra/ofa.c +++ b/drivers/gpu/drm/tegra/ofa.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -635,12 +635,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); } diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 90a6c6ec..43732ed6 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2013-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index b10e9e4a..746ac97c 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-2024 NVIDIA CORPORATION. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -834,12 +834,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); } diff --git a/drivers/gpu/drm/tegra/virt.c b/drivers/gpu/drm/tegra/virt.c index 922bcabe..f8d2cb37 100644 --- a/drivers/gpu/drm/tegra/virt.c +++ b/drivers/gpu/drm/tegra/virt.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -564,12 +564,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); } diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index 3d413046..452dd79d 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -2,7 +2,7 @@ /* * Tegra host1x driver * - * SPDX-FileCopyrightText: Copyright (c) 2010-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2010-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c index d22cabf5..9c16596f 100644 --- a/drivers/gpu/host1x/mipi.c +++ b/drivers/gpu/host1x/mipi.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2013-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2013-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -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); } diff --git a/drivers/media/platform/tegra/cam_fsync/cam_fsync.c b/drivers/media/platform/tegra/cam_fsync/cam_fsync.c index 382750d5..cd081e17 100644 --- a/drivers/media/platform/tegra/cam_fsync/cam_fsync.c +++ b/drivers/media/platform/tegra/cam_fsync/cam_fsync.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1124,12 +1124,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); } diff --git a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c index 142b8667..0120a51d 100644 --- a/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c +++ b/drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /** * @file drivers/media/platform/tegra/camera/fusa-capture/capture-vi.c @@ -1717,12 +1717,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); } diff --git a/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c b/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c index 167259ff..be8730b5 100644 --- a/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c +++ b/drivers/media/platform/tegra/cdi/cam_cdi_tsc.c @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. */ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * cam_cdi_tsc.c - tsc driver. */ @@ -646,12 +646,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); } diff --git a/drivers/media/platform/tegra/cdi/cdi_gpio.c b/drivers/media/platform/tegra/cdi/cdi_gpio.c index 34775ddc..2871e047 100644 --- a/drivers/media/platform/tegra/cdi/cdi_gpio.c +++ b/drivers/media/platform/tegra/cdi/cdi_gpio.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/media/platform/tegra/cdi/cdi_mgr.c b/drivers/media/platform/tegra/cdi/cdi_mgr.c index 198f3177..75991e75 100644 --- a/drivers/media/platform/tegra/cdi/cdi_mgr.c +++ b/drivers/media/platform/tegra/cdi/cdi_mgr.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (C) 2015-2024 NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -2085,12 +2085,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); } diff --git a/drivers/media/platform/tegra/cdi/cdi_pwm.c b/drivers/media/platform/tegra/cdi/cdi_pwm.c index 098bbcd1..ec13a369 100644 --- a/drivers/media/platform/tegra/cdi/cdi_pwm.c +++ b/drivers/media/platform/tegra/cdi/cdi_pwm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2016-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -255,12 +255,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); } diff --git a/drivers/media/platform/tegra/isc/isc_gpio.c b/drivers/media/platform/tegra/isc/isc_gpio.c index 35d5af5e..d8b557a7 100644 --- a/drivers/media/platform/tegra/isc/isc_gpio.c +++ b/drivers/media/platform/tegra/isc/isc_gpio.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/media/platform/tegra/isc/isc_mgr.c b/drivers/media/platform/tegra/isc/isc_mgr.c index 73c83d7f..003401f2 100644 --- a/drivers/media/platform/tegra/isc/isc_mgr.c +++ b/drivers/media/platform/tegra/isc/isc_mgr.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2015-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/media/platform/tegra/isc/isc_pwm.c b/drivers/media/platform/tegra/isc/isc_pwm.c index 462b2dc7..11528f27 100644 --- a/drivers/media/platform/tegra/isc/isc_pwm.c +++ b/drivers/media/platform/tegra/isc/isc_pwm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2016-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2016-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -255,12 +255,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); } diff --git a/drivers/misc/bluedroid_pm.c b/drivers/misc/bluedroid_pm.c index d2dc7893..6bb1a4f6 100644 --- a/drivers/misc/bluedroid_pm.c +++ b/drivers/misc/bluedroid_pm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -628,12 +628,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); } diff --git a/drivers/misc/nvsciipc/nvsciipc.c b/drivers/misc/nvsciipc/nvsciipc.c index 0d491376..c57946bf 100644 --- a/drivers/misc/nvsciipc/nvsciipc.c +++ b/drivers/misc/nvsciipc/nvsciipc.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * This is NvSciIpc kernel driver. At present its only use is to support @@ -832,12 +832,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); } diff --git a/drivers/mtd/devices/tegra_hv_mtd.c b/drivers/mtd/devices/tegra_hv_mtd.c index 06568cd6..d66c24c5 100644 --- a/drivers/mtd/devices/tegra_hv_mtd.c +++ b/drivers/mtd/devices/tegra_hv_mtd.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -727,12 +727,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); } diff --git a/drivers/net/can/mttcan/native/m_ttcan_linux.c b/drivers/net/can/mttcan/native/m_ttcan_linux.c index f414f4b2..4fa87d49 100644 --- a/drivers/net/can/mttcan/native/m_ttcan_linux.c +++ b/drivers/net/can/mttcan/native/m_ttcan_linux.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All Rights Reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -2008,12 +2008,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); } diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 2048d2c8..13b1d75f 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -7049,12 +7049,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); } diff --git a/drivers/nvpmodel/nvpmodel-clk-cap.c b/drivers/nvpmodel/nvpmodel-clk-cap.c index 77970a63..8acabc56 100644 --- a/drivers/nvpmodel/nvpmodel-clk-cap.c +++ b/drivers/nvpmodel/nvpmodel-clk-cap.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/nvpps/nvpps_main.c b/drivers/nvpps/nvpps_main.c index 6addb464..c325acae 100644 --- a/drivers/nvpps/nvpps_main.c +++ b/drivers/nvpps/nvpps_main.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2018-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2018-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1190,12 +1190,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); } diff --git a/drivers/pci/controller/pcie-tegra-vf.c b/drivers/pci/controller/pcie-tegra-vf.c index bf88a7c3..c1358c81 100644 --- a/drivers/pci/controller/pcie-tegra-vf.c +++ b/drivers/pci/controller/pcie-tegra-vf.c @@ -2,7 +2,7 @@ /* * PCIe driver to enumerate PCIe virtual functions in VM. * - * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * */ @@ -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); } diff --git a/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c b/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c index 536375bd..f8b19cf0 100644 --- a/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c +++ b/drivers/platform/tegra/aon/tegra-aon-ivc-echo.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/platform/tegra/aon/tegra-aon-module.c b/drivers/platform/tegra/aon/tegra-aon-module.c index e2df08f0..118e654d 100644 --- a/drivers/platform/tegra/aon/tegra-aon-module.c +++ b/drivers/platform/tegra/aon/tegra-aon-module.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2020-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -162,12 +162,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); } diff --git a/drivers/platform/tegra/dce/dce-module.c b/drivers/platform/tegra/dce/dce-module.c index 384db506..a66a6f65 100644 --- a/drivers/platform/tegra/dce/dce-module.c +++ b/drivers/platform/tegra/dce/dce-module.c @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. // SPDX-License-Identifier: GPL-2.0-only #include @@ -307,12 +307,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); } diff --git a/drivers/platform/tegra/mc-hwpm.c b/drivers/platform/tegra/mc-hwpm.c index de607ad0..8a5722ce 100644 --- a/drivers/platform/tegra/mc-hwpm.c +++ b/drivers/platform/tegra/mc-hwpm.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #define pr_fmt(fmt) "mc-hwpm: " fmt @@ -146,12 +146,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); } diff --git a/drivers/platform/tegra/mce/tegra23x-mce.c b/drivers/platform/tegra/mce/tegra23x-mce.c index 1fa3ab41..c1738f51 100644 --- a/drivers/platform/tegra/mce/tegra23x-mce.c +++ b/drivers/platform/tegra/mce/tegra23x-mce.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/platform/tegra/nvadsp/dev.c b/drivers/platform/tegra/nvadsp/dev.c index 3c43e2ee..01e42400 100644 --- a/drivers/platform/tegra/nvadsp/dev.c +++ b/drivers/platform/tegra/nvadsp/dev.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -584,12 +584,12 @@ MODULE_DEVICE_TABLE(of, nvadsp_of_match); #endif #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); } diff --git a/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c b/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c index 543adc1f..202cd626 100644 --- a/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c +++ b/drivers/platform/tegra/psc/tegra23x_psc_mailbox.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2020-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -296,12 +296,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); } diff --git a/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c b/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c index 2bfa5440..8ae0439d 100644 --- a/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c +++ b/drivers/platform/tegra/rtcpu/tegra-camera-rtcpu-base.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -969,12 +969,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); } diff --git a/drivers/platform/tegra/tegra-cactmon-mc-all.c b/drivers/platform/tegra/tegra-cactmon-mc-all.c index 90f322b5..f428aa3b 100644 --- a/drivers/platform/tegra/tegra-cactmon-mc-all.c +++ b/drivers/platform/tegra/tegra-cactmon-mc-all.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -139,12 +139,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); } diff --git a/drivers/platform/tegra/tegra-fsicom.c b/drivers/platform/tegra/tegra-fsicom.c index 3e3dce29..3c721952 100644 --- a/drivers/platform/tegra/tegra-fsicom.c +++ b/drivers/platform/tegra/tegra-fsicom.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/platform/tegra/tegra-uss-io-proxy.c b/drivers/platform/tegra/tegra-uss-io-proxy.c index bd058d77..c4d4f343 100644 --- a/drivers/platform/tegra/tegra-uss-io-proxy.c +++ b/drivers/platform/tegra/tegra-uss-io-proxy.c @@ -2,7 +2,7 @@ /* * Tegra Ultrasonics Sensor Subsystem IO-Proxy driver * - * SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/platform/tegra/tegra_bootloader_debug.c b/drivers/platform/tegra/tegra_bootloader_debug.c index eceaedd9..4a0df735 100644 --- a/drivers/platform/tegra/tegra_bootloader_debug.c +++ b/drivers/platform/tegra/tegra_bootloader_debug.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -677,12 +677,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); } diff --git a/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c b/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c index eeff2972..a3960f1a 100644 --- a/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c +++ b/drivers/platform/tegra/uncore_pmu/tegra23x_perf_uncore.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/pwm/pwm-tegra-tachometer.c b/drivers/pwm/pwm-tegra-tachometer.c index 83b6902e..5049ad30 100644 --- a/drivers/pwm/pwm-tegra-tachometer.c +++ b/drivers/pwm/pwm-tegra-tachometer.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -568,12 +568,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); } diff --git a/drivers/ras/arm64-ras.c b/drivers/ras/arm64-ras.c index 33b0cc4b..cc86a67c 100644 --- a/drivers/ras/arm64-ras.c +++ b/drivers/ras/arm64-ras.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/rtc/nvvrs-pseq-rtc.c b/drivers/rtc/nvvrs-pseq-rtc.c index 3908f676..d7beefd5 100644 --- a/drivers/rtc/nvvrs-pseq-rtc.c +++ b/drivers/rtc/nvvrs-pseq-rtc.c @@ -2,7 +2,7 @@ /* * RTC driver for NVIDIA Voltage Regulator Power Sequencer * - * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/rtc/rtc-max77851.c b/drivers/rtc/rtc-max77851.c index a858f749..05376482 100644 --- a/drivers/rtc/rtc-max77851.c +++ b/drivers/rtc/rtc-max77851.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * RTC driver for Maxim MAX77851 */ @@ -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); } diff --git a/drivers/scsi/ufs/ufs-tegra-common.c b/drivers/scsi/ufs/ufs-tegra-common.c index e6350fa6..0064a4dc 100644 --- a/drivers/scsi/ufs/ufs-tegra-common.c +++ b/drivers/scsi/ufs/ufs-tegra-common.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2015-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1949,12 +1949,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); } diff --git a/drivers/soc/tegra/fuse/kfuse.c b/drivers/soc/tegra/fuse/kfuse.c index 2bf6afa0..404eca04 100644 --- a/drivers/soc/tegra/fuse/kfuse.c +++ b/drivers/soc/tegra/fuse/kfuse.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* The kfuse block stores downstream and upstream HDCP keys for use by HDMI * module. @@ -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); } diff --git a/drivers/spi/spi-tegra124-slave.c b/drivers/spi/spi-tegra124-slave.c index c0cbcd8e..bdd5059d 100644 --- a/drivers/spi/spi-tegra124-slave.c +++ b/drivers/spi/spi-tegra124-slave.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (C) 2023-2024 NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -2274,12 +2274,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); } diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c index 42e90db3..7383bd18 100644 --- a/drivers/spi/spi-tegra210-quad.c +++ b/drivers/spi/spi-tegra210-quad.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (C) 2023-2024 NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1925,12 +1925,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); } diff --git a/drivers/thermal/tegra234-oc-event.c b/drivers/thermal/tegra234-oc-event.c index e7bfa4f7..c3187bb9 100644 --- a/drivers/thermal/tegra234-oc-event.c +++ b/drivers/thermal/tegra234-oc-event.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/thermal/thermal-trip-event.c b/drivers/thermal/thermal-trip-event.c index 504210d6..ad49f4bd 100644 --- a/drivers/thermal/thermal-trip-event.c +++ b/drivers/thermal/thermal-trip-event.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/video/tegra/camera/tegra_camera_platform.c b/drivers/video/tegra/camera/tegra_camera_platform.c index 6c194f21..b2b55100 100644 --- a/drivers/video/tegra/camera/tegra_camera_platform.c +++ b/drivers/video/tegra/camera/tegra_camera_platform.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2015-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -794,12 +794,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); } diff --git a/drivers/video/tegra/host/capture/capture-support.c b/drivers/video/tegra/host/capture/capture-support.c index e471b2e5..e8d8514f 100644 --- a/drivers/video/tegra/host/capture/capture-support.c +++ b/drivers/video/tegra/host/capture/capture-support.c @@ -2,7 +2,7 @@ /* * Capture support for syncpoint and GoS management * - * SPDX-FileCopyrightText: Copyright (c) 2017-2024, NVIDIA Corporation. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -190,12 +190,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); } diff --git a/drivers/video/tegra/host/isp/isp5.c b/drivers/video/tegra/host/isp/isp5.c index 574def2f..0efa5154 100644 --- a/drivers/video/tegra/host/isp/isp5.c +++ b/drivers/video/tegra/host/isp/isp5.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -347,12 +347,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); } diff --git a/drivers/video/tegra/host/nvcsi/nvcsi-t194.c b/drivers/video/tegra/host/nvcsi/nvcsi-t194.c index 77af2ba0..ac33d478 100644 --- a/drivers/video/tegra/host/nvcsi/nvcsi-t194.c +++ b/drivers/video/tegra/host/nvcsi/nvcsi-t194.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c index 2132d7b9..b35f829f 100644 --- a/drivers/video/tegra/host/nvdla/nvdla.c +++ b/drivers/video/tegra/host/nvdla/nvdla.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2016-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2016-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * NVDLA driver for T194/T23x */ @@ -1529,12 +1529,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); } diff --git a/drivers/video/tegra/host/pva/pva.c b/drivers/video/tegra/host/pva/pva.c index 3c4662a2..f775fc54 100644 --- a/drivers/video/tegra/host/pva/pva.c +++ b/drivers/video/tegra/host/pva/pva.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2016-2024, NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2016-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1709,12 +1709,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); } diff --git a/drivers/video/tegra/host/pva/pva_iommu_context_dev.c b/drivers/video/tegra/host/pva/pva_iommu_context_dev.c index a47abf94..936dc604 100644 --- a/drivers/video/tegra/host/pva/pva_iommu_context_dev.c +++ b/drivers/video/tegra/host/pva/pva_iommu_context_dev.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * PVA Application Specific Virtual Memory */ @@ -240,12 +240,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); } diff --git a/drivers/video/tegra/host/vi/vi5.c b/drivers/video/tegra/host/vi/vi5.c index 05bac254..2a3387ab 100644 --- a/drivers/video/tegra/host/vi/vi5.c +++ b/drivers/video/tegra/host/vi/vi5.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2017-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * VI5 driver */ @@ -432,12 +432,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); } diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c index 0cf5abd5..6c731567 100644 --- a/drivers/video/tegra/nvmap/nvmap_init.c +++ b/drivers/video/tegra/nvmap/nvmap_init.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA CORPORATION. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #define pr_fmt(fmt) "%s: " fmt, __func__ @@ -1010,12 +1010,12 @@ static bool nvmap_is_carveout_node_present(void) #endif /* NVMAP_LOADABLE_MODULE */ #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); } diff --git a/drivers/video/tegra/tsec/tsec.c b/drivers/video/tegra/tsec/tsec.c index abdc1faa..e710d5e2 100644 --- a/drivers/video/tegra/tsec/tsec.c +++ b/drivers/video/tegra/tsec/tsec.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * Tegra TSEC Module Support */ @@ -463,12 +463,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); } diff --git a/drivers/virt/tegra/tegra_hv.c b/drivers/virt/tegra/tegra_hv.c index c94bc7a2..9dcbcd9c 100644 --- a/drivers/virt/tegra/tegra_hv.c +++ b/drivers/virt/tegra/tegra_hv.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1008,12 +1008,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); } diff --git a/drivers/virt/tegra/tegra_hv_pm_ctl.c b/drivers/virt/tegra/tegra_hv_pm_ctl.c index 92deb603..d4553076 100644 --- a/drivers/virt/tegra/tegra_hv_pm_ctl.c +++ b/drivers/virt/tegra/tegra_hv_pm_ctl.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -1145,12 +1145,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); } diff --git a/drivers/virt/tegra/tegra_hv_vcpu_yield.c b/drivers/virt/tegra/tegra_hv_vcpu_yield.c index c423fa6d..ca0fe099 100644 --- a/drivers/virt/tegra/tegra_hv_vcpu_yield.c +++ b/drivers/virt/tegra/tegra_hv_vcpu_yield.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #define pr_fmt(fmt) "%s:%s(): " fmt, KBUILD_MODNAME, __func__ @@ -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); } diff --git a/drivers/watchdog/max77851_wdt.c b/drivers/watchdog/max77851_wdt.c index b8244a06..867d96d5 100644 --- a/drivers/watchdog/max77851_wdt.c +++ b/drivers/watchdog/max77851_wdt.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. /* * Maxim MAX77851 Watchdog Driver */ @@ -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); } diff --git a/drivers/watchdog/softdog-platform.c b/drivers/watchdog/softdog-platform.c index 154ebdb3..c32fbb40 100644 --- a/drivers/watchdog/softdog-platform.c +++ b/drivers/watchdog/softdog-platform.c @@ -2,7 +2,7 @@ /* * A platform based Software Watchdog Device * - * SPDX-FileCopyrightText: Copyright (c) 2014-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include @@ -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); } diff --git a/drivers/watchdog/watchdog-tegra-t18x.c b/drivers/watchdog/watchdog-tegra-t18x.c index 53464caf..c7226712 100644 --- a/drivers/watchdog/watchdog-tegra-t18x.c +++ b/drivers/watchdog/watchdog-tegra-t18x.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -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); } diff --git a/scripts/coccinelle/platform_driver_remove.cocci b/scripts/coccinelle/platform_driver_remove.cocci index 07e9884d..797c7623 100644 --- a/scripts/coccinelle/platform_driver_remove.cocci +++ b/scripts/coccinelle/platform_driver_remove.cocci @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. // Options: --no-includes --include-headers --smpl-spacing @match1@ @@ -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); +} diff --git a/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c b/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c index 8aecdc8e..e4ab9ddc 100644 --- a/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c +++ b/sound/soc/tegra-virt-alt/tegra_virt_ref_alt.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include @@ -250,12 +250,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); } diff --git a/sound/soc/tegra/tegra186_arad.c b/sound/soc/tegra/tegra186_arad.c index 65d73712..4b7078a0 100644 --- a/sound/soc/tegra/tegra186_arad.c +++ b/sound/soc/tegra/tegra186_arad.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2015-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2015-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * tegra186_arad.c - Tegra186 ARAD driver */ @@ -799,12 +799,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); } diff --git a/sound/soc/tegra/tegra210_adsp.c b/sound/soc/tegra/tegra210_adsp.c index a2ef7559..6c778e95 100644 --- a/sound/soc/tegra/tegra210_adsp.c +++ b/sound/soc/tegra/tegra210_adsp.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * tegra210_adsp.c - Tegra ADSP audio driver * @@ -4809,12 +4809,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); } diff --git a/sound/soc/tegra/tegra210_afc.c b/sound/soc/tegra/tegra210_afc.c index 2f82e3a3..b5c56888 100644 --- a/sound/soc/tegra/tegra210_afc.c +++ b/sound/soc/tegra/tegra210_afc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * tegra210_afc.c - Tegra210 AFC driver */ @@ -564,12 +564,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); } diff --git a/sound/soc/tegra/tegra210_iqc.c b/sound/soc/tegra/tegra210_iqc.c index a1e26e72..1fd6e4a7 100644 --- a/sound/soc/tegra/tegra210_iqc.c +++ b/sound/soc/tegra/tegra210_iqc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * SPDX-FileCopyrightText: Copyright (c) 2014-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. * * tegra210_iqc.c - Tegra210 IQC driver */ @@ -350,12 +350,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); } diff --git a/sound/tegra-safety-audio/sound-card.c b/sound/tegra-safety-audio/sound-card.c index 4fcd1e1b..2af4b06a 100644 --- a/sound/tegra-safety-audio/sound-card.c +++ b/sound/tegra-safety-audio/sound-card.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -// SPDX-FileCopyrightText: Copyright (c) 2021-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. #define pr_fmt(msg) "Safety I2S: " msg @@ -816,12 +816,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); }