mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-22 17:25:35 +03:00
drivers: Fix platform_driver remove for Linux v6.11
In Linux v6.11, the 'platform_driver' structure 'remove' callback was updated to return void instead of 'int'. Update all the impacted drivers as necessary to fix this. Bug 4749580 Change-Id: I3bb5c549777f7ccad0e3f870373fdd25726ad7ed Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3182878 Reviewed-by: Brad Griffis <bgriffis@nvidia.com> Tested-by: Brad Griffis <bgriffis@nvidia.com> GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
e7b93be004
commit
951b2423a8
@@ -1,6 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
// SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
|
||||
#include <nvidia/conftest.h>
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
@@ -756,9 +758,21 @@ 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)
|
||||
{
|
||||
tegra_bl_debug_remove(pdev);
|
||||
}
|
||||
#else
|
||||
static inline int tegra_bl_debug_remove_wrapper(struct platform_device *pdev)
|
||||
{
|
||||
return tegra_bl_debug_remove(pdev);
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct platform_driver tegra_bl_debug_driver = {
|
||||
.probe = tegra_bl_debug_probe,
|
||||
.remove = tegra_bl_debug_remove,
|
||||
.remove = tegra_bl_debug_remove_wrapper,
|
||||
.driver = {
|
||||
.name = "tegra_bl_debug",
|
||||
.pm = &profiler_pm_ops,
|
||||
|
||||
Reference in New Issue
Block a user