@@ -1193,6 +1193,11 @@ struct snd_soc_card {
void *drvdata;
};
+#define for_each_component(component, card) \
+ list_for_each_entry(component, &(card)->component_dev_list, card_list)
+#define for_each_component_safe(component, _component, card) \
+ list_for_each_entry_safe(component, _component, \
+ &(card)->component_dev_list, card_list)
/* SoC machine DAI configuration, glues a codec and cpu DAI together */
struct snd_soc_pcm_runtime {
@@ -703,7 +703,7 @@ int snd_soc_suspend(struct device *dev)
snd_soc_dapm_sync(&card->dapm);
/* suspend all COMPONENTs */
- list_for_each_entry(component, &card->component_dev_list, card_list) {
+ for_each_component(component, card) {
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
/* If there are paths active then the COMPONENT will be held with
@@ -794,7 +794,7 @@ static void soc_resume_deferred(struct work_struct *work)
cpu_dai->driver->resume(cpu_dai);
}
- list_for_each_entry(component, &card->component_dev_list, card_list) {
+ for_each_component(component, card) {
if (component->suspended) {
if (component->resume)
component->resume(component);
@@ -1764,7 +1764,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
order++) {
- list_for_each_entry(comp, &card->component_dev_list, card_list) {
+ for_each_component(comp, card) {
if (!comp->auxiliary)
continue;
@@ -1790,9 +1790,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
order++) {
- list_for_each_entry_safe(comp, _comp,
- &card->component_dev_list, card_list) {
-
+ for_each_component_safe(comp, _comp, card) {
if (!comp->auxiliary)
continue;
@@ -2631,8 +2631,7 @@ static void soc_pcm_free(struct snd_pcm *pcm)
struct snd_soc_pcm_runtime *rtd = pcm->private_data;
struct snd_soc_component *component;
- list_for_each_entry(component, &rtd->card->component_dev_list,
- card_list) {
+ for_each_component(component, rtd->card) {
if (component->pcm_free)
component->pcm_free(pcm);
}
@@ -2753,7 +2752,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
if (capture)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &rtd->ops);
- list_for_each_entry(component, &rtd->card->component_dev_list, card_list) {
+ for_each_component(component, rtd->card) {
if (component->pcm_new) {
ret = component->pcm_new(rtd);
if (ret < 0) {
The patch ASoC: add for_each_component{_safe} has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From d75e460ad330518b56635cfccfba78c90ff0c9df Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Date: Mon, 19 Dec 2016 07:37:57 +0000 Subject: [PATCH] ASoC: add for_each_component{_safe} To be more readable code, this patch adds new for_each_component macro. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- include/sound/soc.h | 5 +++++ sound/soc/soc-core.c | 10 ++++------ sound/soc/soc-pcm.c | 5 ++--- 3 files changed, 11 insertions(+), 9 deletions(-)