aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hsu <KCHSU0@nuvoton.com>2017-08-24 23:35:44 -0400
committerMark Brown <broonie@kernel.org>2017-08-25 09:57:33 -0400
commit3dfcd3468cf05861654b1c7857500da6c8a9fc88 (patch)
treeeac42fe539d096d024e0b635160cf9455973a5b6
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff)
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: John Hsu <KCHSU0@nuvoton.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/nau8825.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c
index 46a30eaa7ace..a97b0b6d9086 100644
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
@@ -260,11 +260,11 @@ static int nau8825_sema_acquire(struct nau8825 *nau8825, long timeout)
260 if (timeout) { 260 if (timeout) {
261 ret = down_timeout(&nau8825->xtalk_sem, timeout); 261 ret = down_timeout(&nau8825->xtalk_sem, timeout);
262 if (ret < 0) 262 if (ret < 0)
263 dev_warn(nau8825->dev, "Acquire semaphone timeout\n"); 263 dev_warn(nau8825->dev, "Acquire semaphore timeout\n");
264 } else { 264 } else {
265 ret = down_interruptible(&nau8825->xtalk_sem); 265 ret = down_interruptible(&nau8825->xtalk_sem);
266 if (ret < 0) 266 if (ret < 0)
267 dev_warn(nau8825->dev, "Acquire semaphone fail\n"); 267 dev_warn(nau8825->dev, "Acquire semaphore fail\n");
268 } 268 }
269 269
270 return ret; 270 return ret;
@@ -1299,7 +1299,7 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream,
1299 regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1, 1299 regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1,
1300 NAU8825_I2S_DL_MASK, val_len); 1300 NAU8825_I2S_DL_MASK, val_len);
1301 1301
1302 /* Release the semaphone. */ 1302 /* Release the semaphore. */
1303 nau8825_sema_release(nau8825); 1303 nau8825_sema_release(nau8825);
1304 1304
1305 return 0; 1305 return 0;
@@ -1361,7 +1361,7 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
1361 regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, 1361 regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,
1362 NAU8825_I2S_MS_MASK, ctrl2_val); 1362 NAU8825_I2S_MS_MASK, ctrl2_val);
1363 1363
1364 /* Release the semaphone. */ 1364 /* Release the semaphore. */
1365 nau8825_sema_release(nau8825); 1365 nau8825_sema_release(nau8825);
1366 1366
1367 return 0; 1367 return 0;
@@ -2140,7 +2140,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2140 2140
2141 break; 2141 break;
2142 case NAU8825_CLK_MCLK: 2142 case NAU8825_CLK_MCLK:
2143 /* Acquire the semaphone to synchronize the playback and 2143 /* Acquire the semaphore to synchronize the playback and
2144 * interrupt handler. In order to avoid the playback inter- 2144 * interrupt handler. In order to avoid the playback inter-
2145 * fered by cross talk process, the driver make the playback 2145 * fered by cross talk process, the driver make the playback
2146 * preparation halted until cross talk process finish. 2146 * preparation halted until cross talk process finish.
@@ -2150,7 +2150,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2150 /* MCLK not changed by clock tree */ 2150 /* MCLK not changed by clock tree */
2151 regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, 2151 regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER,
2152 NAU8825_CLK_MCLK_SRC_MASK, 0); 2152 NAU8825_CLK_MCLK_SRC_MASK, 0);
2153 /* Release the semaphone. */ 2153 /* Release the semaphore. */
2154 nau8825_sema_release(nau8825); 2154 nau8825_sema_release(nau8825);
2155 2155
2156 ret = nau8825_mclk_prepare(nau8825, freq); 2156 ret = nau8825_mclk_prepare(nau8825, freq);
@@ -2188,7 +2188,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2188 2188
2189 break; 2189 break;
2190 case NAU8825_CLK_FLL_MCLK: 2190 case NAU8825_CLK_FLL_MCLK:
2191 /* Acquire the semaphone to synchronize the playback and 2191 /* Acquire the semaphore to synchronize the playback and
2192 * interrupt handler. In order to avoid the playback inter- 2192 * interrupt handler. In order to avoid the playback inter-
2193 * fered by cross talk process, the driver make the playback 2193 * fered by cross talk process, the driver make the playback
2194 * preparation halted until cross talk process finish. 2194 * preparation halted until cross talk process finish.
@@ -2201,7 +2201,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2201 regmap_update_bits(regmap, NAU8825_REG_FLL3, 2201 regmap_update_bits(regmap, NAU8825_REG_FLL3,
2202 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, 2202 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
2203 NAU8825_FLL_CLK_SRC_MCLK | 0); 2203 NAU8825_FLL_CLK_SRC_MCLK | 0);
2204 /* Release the semaphone. */ 2204 /* Release the semaphore. */
2205 nau8825_sema_release(nau8825); 2205 nau8825_sema_release(nau8825);
2206 2206
2207 ret = nau8825_mclk_prepare(nau8825, freq); 2207 ret = nau8825_mclk_prepare(nau8825, freq);
@@ -2210,7 +2210,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2210 2210
2211 break; 2211 break;
2212 case NAU8825_CLK_FLL_BLK: 2212 case NAU8825_CLK_FLL_BLK:
2213 /* Acquire the semaphone to synchronize the playback and 2213 /* Acquire the semaphore to synchronize the playback and
2214 * interrupt handler. In order to avoid the playback inter- 2214 * interrupt handler. In order to avoid the playback inter-
2215 * fered by cross talk process, the driver make the playback 2215 * fered by cross talk process, the driver make the playback
2216 * preparation halted until cross talk process finish. 2216 * preparation halted until cross talk process finish.
@@ -2226,7 +2226,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2226 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, 2226 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
2227 NAU8825_FLL_CLK_SRC_BLK | 2227 NAU8825_FLL_CLK_SRC_BLK |
2228 (0xf << NAU8825_GAIN_ERR_SFT)); 2228 (0xf << NAU8825_GAIN_ERR_SFT));
2229 /* Release the semaphone. */ 2229 /* Release the semaphore. */
2230 nau8825_sema_release(nau8825); 2230 nau8825_sema_release(nau8825);
2231 2231
2232 if (nau8825->mclk_freq) { 2232 if (nau8825->mclk_freq) {
@@ -2236,7 +2236,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2236 2236
2237 break; 2237 break;
2238 case NAU8825_CLK_FLL_FS: 2238 case NAU8825_CLK_FLL_FS:
2239 /* Acquire the semaphone to synchronize the playback and 2239 /* Acquire the semaphore to synchronize the playback and
2240 * interrupt handler. In order to avoid the playback inter- 2240 * interrupt handler. In order to avoid the playback inter-
2241 * fered by cross talk process, the driver make the playback 2241 * fered by cross talk process, the driver make the playback
2242 * preparation halted until cross talk process finish. 2242 * preparation halted until cross talk process finish.
@@ -2252,7 +2252,7 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id,
2252 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK, 2252 NAU8825_FLL_CLK_SRC_MASK | NAU8825_GAIN_ERR_MASK,
2253 NAU8825_FLL_CLK_SRC_FS | 2253 NAU8825_FLL_CLK_SRC_FS |
2254 (0xf << NAU8825_GAIN_ERR_SFT)); 2254 (0xf << NAU8825_GAIN_ERR_SFT));
2255 /* Release the semaphone. */ 2255 /* Release the semaphore. */
2256 nau8825_sema_release(nau8825); 2256 nau8825_sema_release(nau8825);
2257 2257
2258 if (nau8825->mclk_freq) { 2258 if (nau8825->mclk_freq) {
@@ -2563,7 +2563,7 @@ static int nau8825_i2c_probe(struct i2c_client *i2c,
2563 return PTR_ERR(nau8825->regmap); 2563 return PTR_ERR(nau8825->regmap);
2564 nau8825->dev = dev; 2564 nau8825->dev = dev;
2565 nau8825->irq = i2c->irq; 2565 nau8825->irq = i2c->irq;
2566 /* Initiate parameters, semaphone and work queue which are needed in 2566 /* Initiate parameters, semaphore and work queue which are needed in
2567 * cross talk suppression measurment function. 2567 * cross talk suppression measurment function.
2568 */ 2568 */
2569 nau8825->xtalk_state = NAU8825_XTALK_DONE; 2569 nau8825->xtalk_state = NAU8825_XTALK_DONE;