Commit 3dfcd346 authored by John Hsu's avatar John Hsu Committed by Mark Brown

ASoC: nau8825: correct typo of semaphore comment

There are a lot of typo about semaphore in the comment.
Correct it from semaphone to semaphore.
Signed-off-by: default avatarJohn Hsu <KCHSU0@nuvoton.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5771a8c0
...@@ -260,11 +260,11 @@ static int nau8825_sema_acquire(struct nau8825 *nau8825, long timeout) ...@@ -260,11 +260,11 @@ static int nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)
if (timeout) { if (timeout) {
ret = down_timeout(&nau8825->xtalk_sem, timeout); ret = down_timeout(&nau8825->xtalk_sem, timeout);
if (ret < 0) if (ret < 0)
dev_warn(nau8825->dev, "Acquire semaphone timeout\n"); dev_warn(nau8825->dev, "Acquire semaphore timeout\n");
} else { } else {
ret = down_interruptible(&nau8825->xtalk_sem); ret = down_interruptible(&nau8825->xtalk_sem);
if (ret < 0) if (ret < 0)
dev_warn(nau8825->dev, "Acquire semaphone fail\n"); dev_warn(nau8825->dev, "Acquire semaphore fail\n");
} }
return ret; return ret;
...@@ -1299,7 +1299,7 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, ...@@ -1299,7 +1299,7 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream,
regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1, regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1,
NAU8825_I2S_DL_MASK, val_len); NAU8825_I2S_DL_MASK, val_len);
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
return 0; return 0;
...@@ -1361,7 +1361,7 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) ...@@ -1361,7 +1361,7 @@ 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, regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,
NAU8825_I2S_MS_MASK, ctrl2_val); NAU8825_I2S_MS_MASK, ctrl2_val);
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
return 0; return 0;
...@@ -2140,7 +2140,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2140,7 +2140,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
break; break;
case NAU8825_CLK_MCLK: case NAU8825_CLK_MCLK:
/* Acquire the semaphone to synchronize the playback and /* Acquire the semaphore to synchronize the playback and
* interrupt handler. In order to avoid the playback inter- * interrupt handler. In order to avoid the playback inter-
* fered by cross talk process, the driver make the playback * fered by cross talk process, the driver make the playback
* preparation halted until cross talk process finish. * preparation halted until cross talk process finish.
...@@ -2150,7 +2150,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2150,7 +2150,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
/* MCLK not changed by clock tree */ /* MCLK not changed by clock tree */
regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER,
NAU8825_CLK_MCLK_SRC_MASK, 0); NAU8825_CLK_MCLK_SRC_MASK, 0);
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
ret = nau8825_mclk_prepare(nau8825, freq); ret = nau8825_mclk_prepare(nau8825, freq);
...@@ -2188,7 +2188,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2188,7 +2188,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
break; break;
case NAU8825_CLK_FLL_MCLK: case NAU8825_CLK_FLL_MCLK:
/* Acquire the semaphone to synchronize the playback and /* Acquire the semaphore to synchronize the playback and
* interrupt handler. In order to avoid the playback inter- * interrupt handler. In order to avoid the playback inter-
* fered by cross talk process, the driver make the playback * fered by cross talk process, the driver make the playback
* preparation halted until cross talk process finish. * preparation halted until cross talk process finish.
...@@ -2201,7 +2201,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2201,7 +2201,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
regmap_update_bits(regmap, NAU8825_REG_FLL3, regmap_update_bits(regmap, NAU8825_REG_FLL3,
NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
NAU8825_FLL_CLK_SRC_MCLK | 0); NAU8825_FLL_CLK_SRC_MCLK | 0);
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
ret = nau8825_mclk_prepare(nau8825, freq); ret = nau8825_mclk_prepare(nau8825, freq);
...@@ -2210,7 +2210,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2210,7 +2210,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
break; break;
case NAU8825_CLK_FLL_BLK: case NAU8825_CLK_FLL_BLK:
/* Acquire the semaphone to synchronize the playback and /* Acquire the semaphore to synchronize the playback and
* interrupt handler. In order to avoid the playback inter- * interrupt handler. In order to avoid the playback inter-
* fered by cross talk process, the driver make the playback * fered by cross talk process, the driver make the playback
* preparation halted until cross talk process finish. * preparation halted until cross talk process finish.
...@@ -2226,7 +2226,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2226,7 +2226,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
NAU8825_FLL_CLK_SRC_BLK | NAU8825_FLL_CLK_SRC_BLK |
(0xf << NAU8825_GAIN_ERR_SFT)); (0xf << NAU8825_GAIN_ERR_SFT));
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
if (nau8825->mclk_freq) { if (nau8825->mclk_freq) {
...@@ -2236,7 +2236,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2236,7 +2236,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
break; break;
case NAU8825_CLK_FLL_FS: case NAU8825_CLK_FLL_FS:
/* Acquire the semaphone to synchronize the playback and /* Acquire the semaphore to synchronize the playback and
* interrupt handler. In order to avoid the playback inter- * interrupt handler. In order to avoid the playback inter-
* fered by cross talk process, the driver make the playback * fered by cross talk process, the driver make the playback
* preparation halted until cross talk process finish. * preparation halted until cross talk process finish.
...@@ -2252,7 +2252,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, ...@@ -2252,7 +2252,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
NAU8825_FLL_CLK_SRC_FS | NAU8825_FLL_CLK_SRC_FS |
(0xf << NAU8825_GAIN_ERR_SFT)); (0xf << NAU8825_GAIN_ERR_SFT));
/* Release the semaphone. */ /* Release the semaphore. */
nau8825_sema_release(nau8825); nau8825_sema_release(nau8825);
if (nau8825->mclk_freq) { if (nau8825->mclk_freq) {
...@@ -2563,7 +2563,7 @@ static int nau8825_i2c_probe(struct i2c_client *i2c, ...@@ -2563,7 +2563,7 @@ static int nau8825_i2c_probe(struct i2c_client *i2c,
return PTR_ERR(nau8825->regmap); return PTR_ERR(nau8825->regmap);
nau8825->dev = dev; nau8825->dev = dev;
nau8825->irq = i2c->irq; nau8825->irq = i2c->irq;
/* Initiate parameters, semaphone and work queue which are needed in /* Initiate parameters, semaphore and work queue which are needed in
* cross talk suppression measurment function. * cross talk suppression measurment function.
*/ */
nau8825->xtalk_state = NAU8825_XTALK_DONE; nau8825->xtalk_state = NAU8825_XTALK_DONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment