iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: add for_each_component_dais() macro

Browse Source 
To be more readable code, this patch adds
new for_each_component_dais() macro, and replace existing code to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-09-21 05:23:17 +00:00 committed by Mark Brown
parent 368dee9459
commit 15a0c64572
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/soc.h
View File

@ -864,6 +864,11 @@ struct snd_soc_component {
#endif #endif
}; };
#define for_each_component_dais(component, dai)\
list_for_each_entry(dai, &(component)->dai_list, list)
#define for_each_component_dais_safe(component, dai, _dai)\
list_for_each_entry_safe(dai, _dai, &(component)->dai_list, list)
struct snd_soc_rtdcom_list { struct snd_soc_rtdcom_list {
struct snd_soc_component *component; struct snd_soc_component *component;
struct list_head list; /* rtd::component_list */ struct list_head list; /* rtd::component_list */

11
sound/soc/soc-core.c
View File

@ -180,7 +180,7 @@ static int dai_list_show(struct seq_file *m, void *v)
mutex_lock(&client_mutex); mutex_lock(&client_mutex);
for_each_component(component) for_each_component(component)
list_for_each_entry(dai, &component->dai_list, list) for_each_component_dais(component, dai)
seq_printf(m, "%s\n", dai->name); seq_printf(m, "%s\n", dai->name);
mutex_unlock(&client_mutex); mutex_unlock(&client_mutex);
@ -781,7 +781,7 @@ struct snd_soc_dai *snd_soc_find_dai(
for_each_component(component) { for_each_component(component) {
if (!snd_soc_is_matching_component(dlc, component)) if (!snd_soc_is_matching_component(dlc, component))
continue; continue;
list_for_each_entry(dai, &component->dai_list, list) { for_each_component_dais(component, dai) {
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)
&& (!dai->driver->name && (!dai->driver->name
|| strcmp(dai->driver->name, dlc->dai_name))) || strcmp(dai->driver->name, dlc->dai_name)))
@ -1312,7 +1312,7 @@ static int soc_probe_component(struct snd_soc_card *card,
} }
} }
list_for_each_entry(dai, &component->dai_list, list) { for_each_component_dais(component, dai) {
ret = snd_soc_dapm_new_dai_widgets(dapm, dai); ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
if (ret != 0) { if (ret != 0) {
dev_err(component->dev, dev_err(component->dev,
@ -2842,7 +2842,7 @@ static void snd_soc_unregister_dais(struct snd_soc_component *component)
{ {
struct snd_soc_dai *dai, *_dai; struct snd_soc_dai *dai, *_dai;
list_for_each_entry_safe(dai, _dai, &component->dai_list, list) { for_each_component_dais_safe(component, dai, _dai) {
dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n", dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n",
dai->name); dai->name);
list_del(&dai->list); list_del(&dai->list);
@ -2894,6 +2894,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
if (!dai->driver->ops) if (!dai->driver->ops)
dai->driver->ops = &null_dai_ops; dai->driver->ops = &null_dai_ops;
/* see for_each_component_dais */
list_add_tail(&dai->list, &component->dai_list); list_add_tail(&dai->list, &component->dai_list);
component->num_dai++; component->num_dai++;
@ -3728,7 +3729,7 @@ int snd_soc_get_dai_name(struct of_phandle_args *args,
ret = 0; ret = 0;
/* find target DAI */ /* find target DAI */
list_for_each_entry(dai, &pos->dai_list, list) { for_each_component_dais(pos, dai) {
if (id == 0) if (id == 0)
break; break;
id--; id--;