ASoC: Add subsequence information to seq_notify callbacks

Allows drivers to distinguish which subsequence is being notified when
they get called back.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

3 files changed, 5 insertions, 4 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 6a25e6993859..979ed84e07d6 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -501,7 +501,7 @@ struct snd_soc_dapm_context {
         struct snd_soc_dapm_update *update;
 
         void (*seq_notifier)(struct snd_soc_dapm_context *,
-                             enum snd_soc_dapm_type);
+                             enum snd_soc_dapm_type, int);
 
         struct device *dev; /* from parent - for debug */
         struct snd_soc_codec *codec; /* parent codec */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 64856d656f15..7ecdaefd1b63 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -553,7 +553,7 @@ struct snd_soc_codec_driver {
                               enum snd_soc_bias_level level);
 
         void (*seq_notifier)(struct snd_soc_dapm_context *,
-                             enum snd_soc_dapm_type);
+                             enum snd_soc_dapm_type, int);
 };
 
 /* SoC platform interface */
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 37b376f4c75d..0f94fd057f29 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -899,7 +899,8 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
                                 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
                                         if (sort[i] == cur_sort)
                                                 cur_dapm->seq_notifier(cur_dapm,
-                                                                       i);
+                                                                       i,
+                                                                       cur_subseq);
                         }
 
                         INIT_LIST_HEAD(&pending);
@@ -968,7 +969,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
                 for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)
                         if (sort[i] == cur_sort)
                                 cur_dapm->seq_notifier(cur_dapm,
-                                                       i);
+                                                       i, cur_subseq);
         }
 }