github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-25 17:42:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: ti: j721e-evm: Use guard() for mutex locks

Browse Source 
Clean up the code using guard() for mutex locks.
Merely code refactoring, and no behavior change.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Link: https://patch.msgid.link/20260508103837.138142-2-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
bui duc phuc 2026-05-08 17:38:31 +07:00 committed by Mark Brown
parent 5d6919055d
commit 6f4cf77320
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/soc/ti/j721e-evm.c
View File

@ -263,7 +263,7 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream)
int ret = 0; int ret = 0;
int i; int i;
mutex_lock(&priv->mutex); guard(mutex)(&priv->mutex);
domain->active++; domain->active++;
@ -303,7 +303,6 @@ static int j721e_audio_startup(struct snd_pcm_substream *substream)
out: out:
if (ret) if (ret)
domain->active--; domain->active--;
mutex_unlock(&priv->mutex);
return ret; return ret;
} }
@ -323,30 +322,28 @@ static int j721e_audio_hw_params(struct snd_pcm_substream *substream,
int ret; int ret;
int i; int i;
mutex_lock(&priv->mutex); guard(mutex)(&priv->mutex);
if (domain->rate && domain->rate != params_rate(params)) { if (domain->rate && domain->rate != params_rate(params))
ret = -EINVAL; return -EINVAL;
goto out;
}
if (params_width(params) == 16) if (params_width(params) == 16)
slot_width = 16; slot_width = 16;
ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, slot_width); ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 0x3, 2, slot_width);
if (ret && ret != -ENOTSUPP) if (ret && ret != -ENOTSUPP)
goto out; return ret;
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 2, ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x3, 0x3, 2,
slot_width); slot_width);
if (ret && ret != -ENOTSUPP) if (ret && ret != -ENOTSUPP)
goto out; return ret;
} }
ret = j721e_configure_refclk(priv, domain_id, params_rate(params)); ret = j721e_configure_refclk(priv, domain_id, params_rate(params));
if (ret) if (ret)
goto out; return ret;
sysclk_rate = priv->hsdiv_rates[domain->parent_clk_id]; sysclk_rate = priv->hsdiv_rates[domain->parent_clk_id];
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
@ -356,7 +353,7 @@ static int j721e_audio_hw_params(struct snd_pcm_substream *substream,
dev_err(priv->dev, dev_err(priv->dev,
"codec set_sysclk failed for %u Hz\n", "codec set_sysclk failed for %u Hz\n",
sysclk_rate); sysclk_rate);
goto out; return ret;
} }
} }
@ -371,8 +368,6 @@ static int j721e_audio_hw_params(struct snd_pcm_substream *substream,
ret = 0; ret = 0;
} }
out:
mutex_unlock(&priv->mutex);
return ret; return ret;
} }
@ -383,15 +378,13 @@ static void j721e_audio_shutdown(struct snd_pcm_substream *substream)
unsigned int domain_id = rtd->dai_link->id; unsigned int domain_id = rtd->dai_link->id;
struct j721e_audio_domain *domain = &priv->audio_domains[domain_id]; struct j721e_audio_domain *domain = &priv->audio_domains[domain_id];
mutex_lock(&priv->mutex); guard(mutex)(&priv->mutex);
domain->active--; domain->active--;
if (!domain->active) { if (!domain->active) {
domain->rate = 0; domain->rate = 0;
domain->active_link = 0; domain->active_link = 0;
} }
mutex_unlock(&priv->mutex);
} }
static const struct snd_soc_ops j721e_audio_ops = { static const struct snd_soc_ops j721e_audio_ops = {