4 files changed, 22 insertions, 58 deletions

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index dc6912e9b667..f8a8a6944e65 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1627,7 +1627,6 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
 {
         struct wm8350_data *priv = snd_soc_codec_get_drvdata(codec);
         struct wm8350 *wm8350 = dev_get_platdata(codec->dev);
-        int ret;
 
         wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
                           WM8350_JDL_ENA | WM8350_JDR_ENA);
@@ -1642,15 +1641,9 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
         priv->hpr.jack = NULL;
         priv->mic.jack = NULL;
 
-        /* cancel any work waiting to be queued. */
-        ret = cancel_delayed_work(&codec->dapm.delayed_work);
-
         /* if there was any work waiting then we run it now and
          * wait for its completion */
-        if (ret) {
-                schedule_delayed_work(&codec->dapm.delayed_work, 0);
-                flush_scheduled_work();
-        }
+        flush_delayed_work_sync(&codec->delayed_work);
 
         wm8350_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 57bf9468d39a..747457193887 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1528,25 +1528,6 @@ static int wm8753_resume(struct snd_soc_codec *codec)
         return 0;
 }
 
-/*
- * This function forces any delayed work to be queued and run.
- */
-static int run_delayed_work(struct delayed_work *dwork)
-{
-        int ret;
-
-        /* cancel any work waiting to be queued. */
-        ret = cancel_delayed_work(dwork);
-
-        /* if there was any work waiting then we run it now and
-         * wait for it's completion */
-        if (ret) {
-                schedule_delayed_work(dwork, 0);
-                flush_scheduled_work();
-        }
-        return ret;
-}
-
 static int wm8753_probe(struct snd_soc_codec *codec)
 {
         struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
@@ -1606,7 +1587,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
 /* power down chip */
 static int wm8753_remove(struct snd_soc_codec *codec)
 {
-        run_delayed_work(&codec->dapm.delayed_work);
+        flush_delayed_work_sync(&codec->delayed_work);
         wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         return 0;
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 19a2f99be60c..97c5394aa7d7 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -142,6 +142,8 @@ struct fsi_priv {
 
         struct fsi_stream playback;
         struct fsi_stream capture;
+
+        long rate;
 };
 
 struct fsi_core {
@@ -829,10 +831,17 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
 {
         struct fsi_priv *fsi = fsi_get_priv(substream);
         int is_play = fsi_is_play(substream);
+        struct fsi_master *master = fsi_get_master(fsi);
+        int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
 
         fsi_irq_disable(fsi, is_play);
         fsi_clk_ctrl(fsi, 0);
 
+        set_rate = master->info->set_rate;
+        if (set_rate && fsi->rate)
+                set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
+        fsi->rate = 0;
+
         pm_runtime_put_sync(dai->dev);
 }
 
@@ -866,20 +875,20 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
 {
         struct fsi_priv *fsi = fsi_get_priv(substream);
         struct fsi_master *master = fsi_get_master(fsi);
-        int (*set_rate)(int is_porta, int rate) = master->info->set_rate;
+        int (*set_rate)(struct device *dev, int is_porta, int rate, int enable);
         int fsi_ver = master->core->ver;
-        int is_play = fsi_is_play(substream);
+        long rate = params_rate(params);
         int ret;
 
-        /* if slave mode, set_rate is not needed */
-        if (!fsi_is_master_mode(fsi, is_play))
+        set_rate = master->info->set_rate;
+        if (!set_rate)
                 return 0;
 
-        /* it is error if no set_rate */
-        if (!set_rate)
-                return -EIO;
+        ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1);
+        if (ret < 0) /* error */
+                return ret;
 
-        ret = set_rate(fsi_is_port_a(fsi), params_rate(params));
+        fsi->rate = rate;
         if (ret > 0) {
                 u32 data = 0;
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a14a0507bbd0..68edc693a8a5 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -70,25 +70,6 @@ static int pmdown_time = 5000;
 module_param(pmdown_time, int, 0);
 MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)");
 
-/*
- * This function forces any delayed work to be queued and run.
- */
-static int run_delayed_work(struct delayed_work *dwork)
-{
-        int ret;
-
-        /* cancel any work waiting to be queued. */
-        ret = cancel_delayed_work(dwork);
-
-        /* if there was any work waiting then we run it now and
-         * wait for it's completion */
-        if (ret) {
-                schedule_delayed_work(dwork, 0);
-                flush_scheduled_work();
-        }
-        return ret;
-}
-
 /* codec register dump */
 static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf)
 {
@@ -1046,7 +1027,7 @@ static int soc_suspend(struct device *dev)
 
         /* close any waiting streams and save state */
         for (i = 0; i < card->num_rtd; i++) {
-                run_delayed_work(&card->rtd[i].delayed_work);
+                flush_delayed_work_sync(&card->rtd[i].delayed_work);
                 card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level;
         }
 
@@ -1921,7 +1902,7 @@ static int soc_remove(struct platform_device *pdev)
                 /* make sure any delayed work runs */
                 for (i = 0; i < card->num_rtd; i++) {
                         struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
-                        run_delayed_work(&rtd->delayed_work);
+                        flush_delayed_work_sync(&rtd->delayed_work);
                 }
 
                 /* remove auxiliary devices */
@@ -1958,7 +1939,7 @@ static int soc_poweroff(struct device *dev)
          * now, we're shutting down so no imminent restart. */
         for (i = 0; i < card->num_rtd; i++) {
                 struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
-                run_delayed_work(&rtd->delayed_work);
+                flush_delayed_work_sync(&rtd->delayed_work);
         }
 
         snd_soc_dapm_shutdown(card);