* [PATCH v2.6.36-rc7] input: cancel_delayed_work_sync() in hp680_ts_input
@ 2010-10-15 12:16 Tejun Heo
2010-10-15 16:55 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2010-10-15 12:16 UTC (permalink / raw)
To: Dmitry Torokhov, Linux Input, Jiri Slaby, lkml
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>
---
drivers/input/touchscreen/hp680_ts_input.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: work/drivers/input/touchscreen/hp680_ts_input.c
===================================================================
--- work.orig/drivers/input/touchscreen/hp680_ts_input.c
+++ work/drivers/input/touchscreen/hp680_ts_input.c
@@ -107,8 +107,7 @@ static int __init hp680_ts_init(void)
return 0;
fail2: free_irq(HP680_TS_IRQ, NULL);
- cancel_delayed_work(&work);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&work);
fail1: input_free_device(hp680_ts_dev);
return err;
}
@@ -116,8 +115,7 @@ static int __init hp680_ts_init(void)
static void __exit hp680_ts_exit(void)
{
free_irq(HP680_TS_IRQ, NULL);
- cancel_delayed_work(&work);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&work);
input_unregister_device(hp680_ts_dev);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2.6.36-rc7] input: cancel_delayed_work_sync() in hp680_ts_input
2010-10-15 12:16 [PATCH v2.6.36-rc7] input: cancel_delayed_work_sync() in hp680_ts_input Tejun Heo
@ 2010-10-15 16:55 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2010-10-15 16:55 UTC (permalink / raw)
To: Tejun Heo; +Cc: Linux Input, Jiri Slaby, lkml
On Fri, Oct 15, 2010 at 02:16:09PM +0200, Tejun Heo wrote:
> 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>
Applied, thanks Tejun.
> ---
> drivers/input/touchscreen/hp680_ts_input.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> Index: work/drivers/input/touchscreen/hp680_ts_input.c
> ===================================================================
> --- work.orig/drivers/input/touchscreen/hp680_ts_input.c
> +++ work/drivers/input/touchscreen/hp680_ts_input.c
> @@ -107,8 +107,7 @@ static int __init hp680_ts_init(void)
> return 0;
>
> fail2: free_irq(HP680_TS_IRQ, NULL);
> - cancel_delayed_work(&work);
> - flush_scheduled_work();
> + cancel_delayed_work_sync(&work);
> fail1: input_free_device(hp680_ts_dev);
> return err;
> }
> @@ -116,8 +115,7 @@ static int __init hp680_ts_init(void)
> static void __exit hp680_ts_exit(void)
> {
> free_irq(HP680_TS_IRQ, NULL);
> - cancel_delayed_work(&work);
> - flush_scheduled_work();
> + cancel_delayed_work_sync(&work);
> input_unregister_device(hp680_ts_dev);
> }
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-15 16:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 12:16 [PATCH v2.6.36-rc7] input: cancel_delayed_work_sync() in hp680_ts_input Tejun Heo
2010-10-15 16:55 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).