sound: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. * cancel[_delayed]_work() + flush_scheduled_work() -> cancel[_delayed]_work_sync(). * wm8350, wm8753 and soc-core use custom code to cancel a delayed work, execute it immediately if it was pending and wait for its completion. This is equivalent to flush_delayed_work_sync(). Use it instead. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
此提交包含在:
@@ -287,10 +287,9 @@ static void ftr_gpio_exit(struct gpio_runtime *rt)
|
||||
free_irq(linein_detect_irq, &rt->line_in_notify);
|
||||
if (rt->line_out_notify.gpio_private)
|
||||
free_irq(lineout_detect_irq, &rt->line_out_notify);
|
||||
cancel_delayed_work(&rt->headphone_notify.work);
|
||||
cancel_delayed_work(&rt->line_in_notify.work);
|
||||
cancel_delayed_work(&rt->line_out_notify.work);
|
||||
flush_scheduled_work();
|
||||
cancel_delayed_work_sync(&rt->headphone_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_in_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_out_notify.work);
|
||||
mutex_destroy(&rt->headphone_notify.mutex);
|
||||
mutex_destroy(&rt->line_in_notify.mutex);
|
||||
mutex_destroy(&rt->line_out_notify.mutex);
|
||||
|
@@ -107,10 +107,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
|
||||
|
||||
/* make sure no work is pending before freeing
|
||||
* all things */
|
||||
cancel_delayed_work(&rt->headphone_notify.work);
|
||||
cancel_delayed_work(&rt->line_in_notify.work);
|
||||
cancel_delayed_work(&rt->line_out_notify.work);
|
||||
flush_scheduled_work();
|
||||
cancel_delayed_work_sync(&rt->headphone_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_in_notify.work);
|
||||
cancel_delayed_work_sync(&rt->line_out_notify.work);
|
||||
|
||||
mutex_destroy(&rt->headphone_notify.mutex);
|
||||
mutex_destroy(&rt->line_in_notify.mutex);
|
||||
|
新增問題並參考
封鎖使用者