Skip to content

Use timer_delete_sync() on 6.15+ #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evgeni merged 2 commits into from
May 26, 2025
Merged

Use timer_delete_sync() on 6.15+ #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27d5233
Use timer_delete_sync() on 6.15+
evgeni May 26, 2025
b96c75d
stop building on Ubuntu 20.04 - it's dead
evgeni May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:
- master
host:
- ubuntu-22.04
include:
- linux: v5.10
host: ubuntu-20.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
8 changes: 8 additions & 0 deletions hdaps.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,11 @@ static int hdaps_probe(struct platform_device *dev)
static int hdaps_suspend(struct platform_device *dev, pm_message_t state)
{
/* Don't do hdaps polls until resume re-initializes the sensor. */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0)
del_timer_sync(&hdaps_timer);
#else
timer_delete_sync(&hdaps_timer);
#endif
hdaps_device_shutdown(); /* ignore errors, effect is negligible */
return 0;
}
Expand Down Expand Up @@ -671,7 +675,11 @@ static void hdaps_mousedev_close(struct input_dev *dev)
{
mutex_lock(&hdaps_users_mtx);
if (--hdaps_users == 0) /* no input users left */
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,15,0)
del_timer_sync(&hdaps_timer);
#else
timer_delete_sync(&hdaps_timer);
#endif
mutex_unlock(&hdaps_users_mtx);

module_put(THIS_MODULE);
Expand Down