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>

2 files changed, 4 insertions, 6 deletions

diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index 971a84a4fa7..c424d329f80 100644
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -57,8 +57,7 @@ static void snd_ak4113_free(struct ak4113 *chip)
 {
         chip->init = 1; /* don't schedule new work */
         mb();
-        cancel_delayed_work(&chip->work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&chip->work);
         kfree(chip);
 }
 
@@ -141,7 +140,7 @@ void snd_ak4113_reinit(struct ak4113 *chip)
 {
         chip->init = 1;
         mb();
-        flush_scheduled_work();
+        flush_delayed_work_sync(&chip->work);
         ak4113_init_regs(chip);
         /* bring up statistics / event queing */
         chip->init = 0;
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 0341451f814..d9fb537b0b9 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -67,8 +67,7 @@ static void snd_ak4114_free(struct ak4114 *chip)
 {
         chip->init = 1; /* don't schedule new work */
         mb();
-        cancel_delayed_work(&chip->work);
-        flush_scheduled_work();
+        cancel_delayed_work_sync(&chip->work);
         kfree(chip);
 }
 
@@ -154,7 +153,7 @@ void snd_ak4114_reinit(struct ak4114 *chip)
 {
         chip->init = 1;
         mb();
-        flush_scheduled_work();
+        flush_delayed_work_sync(&chip->work);
         ak4114_init_regs(chip);
         /* bring up statistics / event queing */
         chip->init = 0;