summaryrefslogtreecommitdiff
path: root/drivers/input/touchscreen/tsc200x-core.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2025-04-05 10:17:26 +0200
committerIngo Molnar <mingo@kernel.org>2025-04-05 10:30:12 +0200
commit8fa7292fee5c5240402371ea89ab285ec856c916 (patch)
treed04d50b067a0f1607c9450276156d94f021a5ba3 /drivers/input/touchscreen/tsc200x-core.c
parenta8662bcd2ff152bfbc751cab20f33053d74d0963 (diff)
downloadlinux-next-8fa7292fee5c5240402371ea89ab285ec856c916.tar.gz
linux-next-8fa7292fee5c5240402371ea89ab285ec856c916.zip
treewide: Switch/rename to timer_delete[_sync]()
timer_delete[_sync]() replaces del_timer[_sync](). Convert the whole tree over and remove the historical wrapper inlines. Conversion was done with coccinelle plus manual fixups where necessary. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/input/touchscreen/tsc200x-core.c')
-rw-r--r--drivers/input/touchscreen/tsc200x-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index df39dee13e1c..252a93753ee5 100644
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -229,7 +229,7 @@ static void __tsc200x_disable(struct tsc200x *ts)
guard(disable_irq)(&ts->irq);
- del_timer_sync(&ts->penup_timer);
+ timer_delete_sync(&ts->penup_timer);
cancel_delayed_work_sync(&ts->esd_work);
}
@@ -388,7 +388,7 @@ static void tsc200x_esd_work(struct work_struct *work)
dev_info(ts->dev, "TSC200X not responding - resetting\n");
scoped_guard(disable_irq, &ts->irq) {
- del_timer_sync(&ts->penup_timer);
+ timer_delete_sync(&ts->penup_timer);
tsc200x_update_pen_state(ts, 0, 0, 0);
tsc200x_reset(ts);
}