ASoC: remove update from snd_soc_card

snd_soc_card :: update is used only for passing parameters to
dapm_widget_update() like below.

	card->update = update;
	ret = soc_dapm_xxx(card, ...);
	card->update = NULL;

Let's passing it via function parameter and remove update from
snd_soc_card.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87ldubyjz9.wl-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 62c90ef40f1a5db5ffc10eea99b51cffbffb3f47..644cfe26022edcc6f5fa13d66e130e638f62b0aa 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1106,7 +1106,6 @@ struct snd_soc_card {
        /* Generic DAPM context for the card */
        struct snd_soc_dapm_context dapm;
        struct snd_soc_dapm_stats dapm_stats;
-       struct snd_soc_dapm_update *update;
 
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_card_root;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 420fe7dea31e9ca4cb3a2f34902a35e5745881d7..b7818388984e3a94df4ca71b94dd9638fa5d6220 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1743,9 +1743,8 @@ static void dapm_seq_run(struct snd_soc_card *card,
                soc_dapm_async_complete(d);
 }
 
-static void dapm_widget_update(struct snd_soc_card *card)
+static void dapm_widget_update(struct snd_soc_card *card, struct snd_soc_dapm_update *update)
 {
-       struct snd_soc_dapm_update *update = card->update;
        struct snd_soc_dapm_widget_list *wlist;
        struct snd_soc_dapm_widget *w = NULL;
        unsigned int wi;
@@ -1951,7 +1950,8 @@ static bool dapm_idle_bias_off(struct snd_soc_dapm_context *dapm)
  *  o Input pin to Output pin (bypass, sidetone)
  *  o DAC to ADC (loopback).
  */
-static int dapm_power_widgets(struct snd_soc_card *card, int event)
+static int dapm_power_widgets(struct snd_soc_card *card, int event,
+                             struct snd_soc_dapm_update *update)
 {
        struct snd_soc_dapm_widget *w;
        struct snd_soc_dapm_context *d;
@@ -2059,7 +2059,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
        /* Power down widgets first; try to avoid amplifying pops. */
        dapm_seq_run(card, &down_list, event, false);
 
-       dapm_widget_update(card);
+       dapm_widget_update(card, update);
 
        /* Now power up. */
        dapm_seq_run(card, &up_list, event, true);
@@ -2332,7 +2332,9 @@ static void soc_dapm_connect_path(struct snd_soc_dapm_path *path,
 
 /* test and update the power status of a mux widget */
 static int soc_dapm_mux_update_power(struct snd_soc_card *card,
-                                struct snd_kcontrol *kcontrol, int mux, struct soc_enum *e)
+                                    struct snd_kcontrol *kcontrol,
+                                    struct snd_soc_dapm_update *update,
+                                    int mux, struct soc_enum *e)
 {
        struct snd_soc_dapm_path *path;
        int found = 0;
@@ -2353,7 +2355,7 @@ static int soc_dapm_mux_update_power(struct snd_soc_card *card,
        }
 
        if (found)
-               dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP);
+               dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, update);
 
        return found;
 }
@@ -2366,9 +2368,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm,
        int ret;
 
        snd_soc_dapm_mutex_lock(card);
-       card->update = update;
-       ret = soc_dapm_mux_update_power(card, kcontrol, mux, e);
-       card->update = NULL;
+       ret = soc_dapm_mux_update_power(card, kcontrol, update, mux, e);
        snd_soc_dapm_mutex_unlock(card);
        if (ret > 0)
                snd_soc_dpcm_runtime_update(card);
@@ -2379,6 +2379,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_mux_update_power);
 /* test and update the power status of a mixer or switch widget */
 static int soc_dapm_mixer_update_power(struct snd_soc_card *card,
                                       struct snd_kcontrol *kcontrol,
+                                      struct snd_soc_dapm_update *update,
                                       int connect, int rconnect)
 {
        struct snd_soc_dapm_path *path;
@@ -2418,7 +2419,7 @@ static int soc_dapm_mixer_update_power(struct snd_soc_card *card,
        }
 
        if (found)
-               dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP);
+               dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, update);
 
        return found;
 }
@@ -2431,9 +2432,7 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm,
        int ret;
 
        snd_soc_dapm_mutex_lock(card);
-       card->update = update;
-       ret = soc_dapm_mixer_update_power(card, kcontrol, connect, -1);
-       card->update = NULL;
+       ret = soc_dapm_mixer_update_power(card, kcontrol, update, connect, -1);
        snd_soc_dapm_mutex_unlock(card);
        if (ret > 0)
                snd_soc_dpcm_runtime_update(card);
@@ -2689,7 +2688,7 @@ int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm)
        if (!snd_soc_card_is_instantiated(dapm->card))
                return 0;
 
-       return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP);
+       return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP, NULL);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_sync_unlocked);
 
@@ -3358,7 +3357,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_card *card)
                dapm_debugfs_add_widget(w);
        }
 
-       dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP);
+       dapm_power_widgets(card, SND_SOC_DAPM_STREAM_NOP, NULL);
        snd_soc_dapm_mutex_unlock(card);
        return 0;
 }
@@ -3447,6 +3446,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
        unsigned int val, rval = 0;
        int connect, rconnect = -1, change, reg_change = 0;
        struct snd_soc_dapm_update update = {};
+       struct snd_soc_dapm_update *pupdate = NULL;
        int ret = 0;
 
        val = (ucontrol->value.integer.value[0] & mask);
@@ -3495,13 +3495,9 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
                        update.reg = reg;
                        update.mask = mask << shift;
                        update.val = val;
-                       card->update = &update;
+                       pupdate = &update;
                }
-
-               ret = soc_dapm_mixer_update_power(card, kcontrol, connect,
-                                                 rconnect);
-
-               card->update = NULL;
+               ret = soc_dapm_mixer_update_power(card, kcontrol, pupdate, connect, rconnect);
        }
 
        snd_soc_dapm_mutex_unlock(card);
@@ -3568,6 +3564,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
        unsigned int val, change, reg_change = 0;
        unsigned int mask;
        struct snd_soc_dapm_update update = {};
+       struct snd_soc_dapm_update *pupdate = NULL;
        int ret = 0;
 
        if (item[0] >= e->items)
@@ -3595,12 +3592,9 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
                        update.reg = e->reg;
                        update.mask = mask;
                        update.val = val;
-                       card->update = &update;
+                       pupdate = &update;
                }
-
-               ret = soc_dapm_mux_update_power(card, kcontrol, item[0], e);
-
-               card->update = NULL;
+               ret = soc_dapm_mux_update_power(card, kcontrol, pupdate, item[0], e);
        }
 
        snd_soc_dapm_mutex_unlock(card);
@@ -4526,7 +4520,7 @@ static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
        for_each_rtd_dais(rtd, i, dai)
                soc_dapm_dai_stream_event(dai, stream, event);
 
-       dapm_power_widgets(rtd->card, event);
+       dapm_power_widgets(rtd->card, event, NULL);
 }
 
 /**