Commit f85a9e0d authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent aaee8ef1

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

sound/soc/soc-dapm.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

	}

}