nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

drivers: Update timer APIs for Linux v6.15

Browse Source 
In Linux v6.15, the timer APIs hrtimer_init() and del_timer() have been
removed. The hrtimer_setup() was added in Linux v6.13 to replace
hrtimer_init() and hrtimer_init() have finally been removed. The
functions del_timer()/del_timer_sync() were renamed to
timer_delete()/timer_delete_sync() in Linux v6.15. Use conftest to
detect these changes and update the drivers as necessary.

JIRA LINQPJ14-47

Change-Id: Id3994900384aad4b91155507cda91e04898ab12c
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3336168
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
This commit is contained in:
Jon Hunter
2025-04-08 13:30:51 +01:00
parent 1d9d3c1755
commit a59a10dfeb
13 changed files with 125 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/watchdog/softdog-platform.c
View File

@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
/*
* A platform based Software Watchdog Device
*
* SPDX-FileCopyrightText: Copyright (c) 2014-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
*/
#include <nvidia/conftest.h>
@@ -186,7 +185,11 @@ static int softdog_platform_probe(struct platform_device *pdev)
reboot_unreg:
unregister_reboot_notifier(&swdt->nb);
timer_del:
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete_sync(&swdt->watchdog_ticktock);
#else
del_timer_sync(&swdt->watchdog_ticktock);
#endif
return ret;
}
@@ -194,7 +197,11 @@ static int softdog_platform_remove(struct platform_device *pdev)
{
struct softdog_platform_wdt *swdt = platform_get_drvdata(pdev);
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete_sync(&swdt->watchdog_ticktock);
#else
del_timer_sync(&swdt->watchdog_ticktock);
#endif
watchdog_unregister_device(&swdt->wdt_dev);
unregister_reboot_notifier(&swdt->nb);
return 0;
@@ -204,7 +211,11 @@ static void softdog_platform_shutdown(struct platform_device *pdev)
{
struct softdog_platform_wdt *swdt = platform_get_drvdata(pdev);
#if defined(NV_TIMER_DELETE_PRESENT) /* Linux v6.15 */
timer_delete_sync(&swdt->watchdog_ticktock);
#else
del_timer_sync(&swdt->watchdog_ticktock);
#endif
}
#ifdef CONFIG_PM_SLEEP