4 files changed, 36 insertions, 49 deletions

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index e5527bc570ae..bcf1834c5648 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1247,8 +1247,8 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
                 return -EINVAL;
         }
 
-        /* By default only 32 BCLK per WCLK is supported */
-        dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_32;
+        /* By default only 64 BCLK per WCLK is supported */
+        dai_clk_mode |= DA7213_DAI_BCLKS_PER_WCLK_64;
 
         snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
         snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c
index cf0a39bb631a..02352ed8961c 100644
--- a/sound/soc/codecs/max98371.c
+++ b/sound/soc/codecs/max98371.c
@@ -412,6 +412,7 @@ static int max98371_i2c_remove(struct i2c_client *client)
 
 static const struct i2c_device_id max98371_i2c_id[] = {
         { "max98371", 0 },
+        { }
 };
 
 MODULE_DEVICE_TABLE(i2c, max98371_i2c_id);
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index 5c9707ac4bbf..2e59a85e360b 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -212,31 +212,6 @@ static const unsigned short logtable[256] = {
         0xfa2f, 0xfaea, 0xfba5, 0xfc60, 0xfd1a, 0xfdd4, 0xfe8e, 0xff47
 };
 
-static struct snd_soc_dai *nau8825_get_codec_dai(struct nau8825 *nau8825)
-{
-        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(nau8825->dapm);
-        struct snd_soc_component *component = &codec->component;
-        struct snd_soc_dai *codec_dai, *_dai;
-
-        list_for_each_entry_safe(codec_dai, _dai, &component->dai_list, list) {
-                if (!strncmp(codec_dai->name, NUVOTON_CODEC_DAI,
-                        strlen(NUVOTON_CODEC_DAI)))
-                        return codec_dai;
-        }
-        return NULL;
-}
-
-static bool nau8825_dai_is_active(struct nau8825 *nau8825)
-{
-        struct snd_soc_dai *codec_dai = nau8825_get_codec_dai(nau8825);
-
-        if (codec_dai) {
-                if (codec_dai->playback_active || codec_dai->capture_active)
-                        return true;
-        }
-        return false;
-}
-
 /**
  * nau8825_sema_acquire - acquire the semaphore of nau88l25
  * @nau8825:  component to register the codec private data with
@@ -250,19 +225,26 @@ static bool nau8825_dai_is_active(struct nau8825 *nau8825)
  * Acquires the semaphore without jiffies. If no more tasks are allowed
  * to acquire the semaphore, calling this function will put the task to
  * sleep until the semaphore is released.
- * It returns if the semaphore was acquired.
+ * If the semaphore is not released within the specified number of jiffies,
+ * this function returns -ETIME.
+ * If the sleep is interrupted by a signal, this function will return -EINTR.
+ * It returns 0 if the semaphore was acquired successfully.
  */
-static void nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)
+static int nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)
 {
         int ret;
 
-        if (timeout)
+        if (timeout) {
                 ret = down_timeout(&nau8825->xtalk_sem, timeout);
-        else
+                if (ret < 0)
+                        dev_warn(nau8825->dev, "Acquire semaphone timeout\n");
+        } else {
                 ret = down_interruptible(&nau8825->xtalk_sem);
+                if (ret < 0)
+                        dev_warn(nau8825->dev, "Acquire semaphone fail\n");
+        }
 
-        if (ret < 0)
-                dev_warn(nau8825->dev, "Acquire semaphone fail\n");
+        return ret;
 }
 
 /**
@@ -1205,6 +1187,8 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream,
         struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
         unsigned int val_len = 0;
 
+        nau8825_sema_acquire(nau8825, 2 * HZ);
+
         switch (params_width(params)) {
         case 16:
                 val_len |= NAU8825_I2S_DL_16;
@@ -1225,6 +1209,9 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream,
         regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1,
                 NAU8825_I2S_DL_MASK, val_len);
 
+        /* Release the semaphone. */
+        nau8825_sema_release(nau8825);
+
         return 0;
 }
 
@@ -1234,6 +1221,8 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
         unsigned int ctrl1_val = 0, ctrl2_val = 0;
 
+        nau8825_sema_acquire(nau8825, 2 * HZ);
+
         switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
         case SND_SOC_DAIFMT_CBM_CFM:
                 ctrl2_val |= NAU8825_I2S_MS_MASTER;
@@ -1282,6 +1271,9 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
         regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,
                 NAU8825_I2S_MS_MASK, ctrl2_val);
 
+        /* Release the semaphone. */
+        nau8825_sema_release(nau8825);
+
         return 0;
 }
 
@@ -1611,8 +1603,11 @@ static irqreturn_t nau8825_interrupt(int irq, void *data)
                                          * cess and restore changes if process
                                          * is ongoing when ejection.
                                          */
+                                        int ret;
                                         nau8825->xtalk_protect = true;
-                                        nau8825_sema_acquire(nau8825, 0);
+                                        ret = nau8825_sema_acquire(nau8825, 0);
+                                        if (ret < 0)
+                                                nau8825->xtalk_protect = false;
                                 }
                                 /* Startup cross talk detection process */
                                 nau8825->xtalk_state = NAU8825_XTALK_PREPARE;
@@ -2238,23 +2233,14 @@ static int __maybe_unused nau8825_suspend(struct snd_soc_codec *codec)
 static int __maybe_unused nau8825_resume(struct snd_soc_codec *codec)
 {
         struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec);
+        int ret;
 
         regcache_cache_only(nau8825->regmap, false);
         regcache_sync(nau8825->regmap);
-        if (nau8825_is_jack_inserted(nau8825->regmap)) {
-                /* If the jack is inserted, we need to check whether the play-
-                 * back is active before suspend. If active, the driver has to
-                 * raise the protection for cross talk function to avoid the
-                 * playback recovers before cross talk process finish. Other-
-                 * wise, the playback will be interfered by cross talk func-
-                 * tion. It is better to apply hardware related parameters
-                 * before starting playback or record.
-                 */
-                if (nau8825_dai_is_active(nau8825)) {
-                        nau8825->xtalk_protect = true;
-                        nau8825_sema_acquire(nau8825, 0);
-                }
-        }
+        nau8825->xtalk_protect = true;
+        ret = nau8825_sema_acquire(nau8825, 0);
+        if (ret < 0)
+                nau8825->xtalk_protect = false;
         enable_irq(nau8825->irq);
 
         return 0;
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index a67ea10f41a1..f2664396be6f 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -581,7 +581,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
         if (anc_transitions[i].dest == ANC_OFF)
                 clk_disable_unprepare(wm2000->mclk);
 
-        return ret;
+        return 0;
 }
 
 static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)