Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 16:29:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input: hp680_ts_input - use cancel_delayed_work_sync()

Browse Source 
Make hp680_ts_init/exit() call cancel_delayed_work_sync() instead of
calling cancel_delayed_work() followed by flush_scheduled_work().

This is to prepare for the deprecation and removal of
flush_scheduled_work().

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Tejun Heo 2010-10-15 09:47:15 -07:00 committed by Dmitry Torokhov
parent f74eef95e3
commit 790d5c8dac
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/touchscreen/hp680_ts_input.c
View File

@ -107,8 +107,7 @@ static int __init hp680_ts_init(void)
return 0; return 0;
fail2: free_irq(HP680_TS_IRQ, NULL); fail2: free_irq(HP680_TS_IRQ, NULL);
cancel_delayed_work(&work); cancel_delayed_work_sync(&work);
flush_scheduled_work();
fail1: input_free_device(hp680_ts_dev); fail1: input_free_device(hp680_ts_dev);
return err; return err;
} }
@ -116,8 +115,7 @@ static int __init hp680_ts_init(void)
static void __exit hp680_ts_exit(void) static void __exit hp680_ts_exit(void)
{ {
free_irq(HP680_TS_IRQ, NULL); free_irq(HP680_TS_IRQ, NULL);
cancel_delayed_work(&work); cancel_delayed_work_sync(&work);
flush_scheduled_work();
input_unregister_device(hp680_ts_dev); input_unregister_device(hp680_ts_dev);
} }