ASoC: add for_each_card_components() macro

To be more readable code, this patch adds
new for_each_card_components() 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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 164418d..34efab6 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1135,6 +1135,9 @@ struct snd_soc_card {
 #define for_each_card_rtds_safe(card, rtd, _rtd)       \
        list_for_each_entry_safe(rtd, _rtd, &(card)->rtd_list, list)
 
+#define for_each_card_components(card, component)                      \
+       list_for_each_entry(component, &(card)->component_dev_list, card_list)
+
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */
 struct snd_soc_pcm_runtime {
        struct device *dev;

diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c
index 7b0ee67..68e6543 100644 (file)
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
 static int broadwell_suspend(struct snd_soc_card *card){
        struct snd_soc_component *component;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, "i2c-INT343A:00")) {
 
                        dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
@@ -237,7 +237,7 @@ static int broadwell_suspend(struct snd_soc_card *card){
 static int broadwell_resume(struct snd_soc_card *card){
        struct snd_soc_component *component;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, "i2c-INT343A:00")) {
 
                        dev_dbg(component->dev, "enabling jack detect for resume.\n");

diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index b6dc524..8587bd3 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -1048,7 +1048,7 @@ static int byt_rt5640_suspend(struct snd_soc_card *card)
        if (!BYT_RT5640_JDSRC(byt_rt5640_quirk))
                return 0;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, byt_rt5640_codec_name)) {
                        dev_dbg(component->dev, "disabling jack detect before suspend\n");
                        snd_soc_component_set_jack(component, NULL, NULL);
@@ -1067,7 +1067,7 @@ static int byt_rt5640_resume(struct snd_soc_card *card)
        if (!BYT_RT5640_JDSRC(byt_rt5640_quirk))
                return 0;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, byt_rt5640_codec_name)) {
                        dev_dbg(component->dev, "re-enabling jack detect after resume\n");
                        snd_soc_component_set_jack(component, &priv->jack, NULL);

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index f8a68bd..8dffeec 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -742,7 +742,7 @@ static int byt_rt5651_suspend(struct snd_soc_card *card)
        if (!BYT_RT5651_JDSRC(byt_rt5651_quirk))
                return 0;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, byt_rt5651_codec_name)) {
                        dev_dbg(component->dev, "disabling jack detect before suspend\n");
                        snd_soc_component_set_jack(component, NULL, NULL);
@@ -761,7 +761,7 @@ static int byt_rt5651_resume(struct snd_soc_card *card)
        if (!BYT_RT5651_JDSRC(byt_rt5651_quirk))
                return 0;
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strcmp(component->name, byt_rt5651_codec_name)) {
                        dev_dbg(component->dev, "re-enabling jack detect after resume\n");
                        snd_soc_component_set_jack(component, &priv->jack, NULL);

diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index e054318..51f0d45 100644 (file)
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -347,7 +347,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
        struct snd_soc_component *component;
        struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card);
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strncmp(component->name,
                             ctx->codec_name, sizeof(ctx->codec_name))) {
 
@@ -364,7 +364,7 @@ static int cht_resume_post(struct snd_soc_card *card)
        struct snd_soc_component *component;
        struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card);
 
-       list_for_each_entry(component, &card->component_dev_list, card_list) {
+       for_each_card_components(card, component) {
                if (!strncmp(component->name,
                             ctx->codec_name, sizeof(ctx->codec_name))) {
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 7efcf34..673a694 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -510,7 +510,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_card_components(card, component) {
                struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
 
                /* If there are paths active then the COMPONENT will be held with
@@ -602,7 +602,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_card_components(card, component) {
                if (component->suspended) {
                        if (component->driver->resume)
                                component->driver->resume(component);
@@ -1354,6 +1354,7 @@ static int soc_probe_component(struct snd_soc_card *card,
                                        component->driver->num_dapm_routes);
 
        list_add(&dapm->list, &card->dapm_list);
+       /* see for_each_card_components */
        list_add(&component->card_list, &card->component_dev_list);
 
        return 0;