summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-04-21 03:02:34 -0400
committerMark Brown <broonie@kernel.org>2015-04-27 16:13:17 -0400
commit2dc0f16b83b43fd1f86a2358d46f46488230c6c8 (patch)
tree259fb9f7acf9f94a5c860e0b46f556ce41d05dd0
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
ASoC: soc.h: tidyup struct snd_soc_dai_link definition order
Current struct snd_soc_dai_link has many members, but definition order was random. Especially, bool / bit field are defined randomly. This patch tidyups these definition order to calculate data alignment easy. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/soc.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index fcb312b3f258..38757fe7a3d8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -949,6 +949,24 @@ struct snd_soc_dai_link {
949 949
950 enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ 950 enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
951 951
952 /* codec/machine specific init - e.g. add machine controls */
953 int (*init)(struct snd_soc_pcm_runtime *rtd);
954
955 /* optional hw_params re-writing for BE and FE sync */
956 int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
957 struct snd_pcm_hw_params *params);
958
959 /* machine stream operations */
960 const struct snd_soc_ops *ops;
961 const struct snd_soc_compr_ops *compr_ops;
962
963 /* For unidirectional dai links */
964 bool playback_only;
965 bool capture_only;
966
967 /* Mark this pcm with non atomic ops */
968 bool nonatomic;
969
952 /* Keep DAI active over suspend */ 970 /* Keep DAI active over suspend */
953 unsigned int ignore_suspend:1; 971 unsigned int ignore_suspend:1;
954 972
@@ -957,9 +975,6 @@ struct snd_soc_dai_link {
957 unsigned int symmetric_channels:1; 975 unsigned int symmetric_channels:1;
958 unsigned int symmetric_samplebits:1; 976 unsigned int symmetric_samplebits:1;
959 977
960 /* Mark this pcm with non atomic ops */
961 bool nonatomic;
962
963 /* Do not create a PCM for this DAI link (Backend link) */ 978 /* Do not create a PCM for this DAI link (Backend link) */
964 unsigned int no_pcm:1; 979 unsigned int no_pcm:1;
965 980
@@ -972,21 +987,6 @@ struct snd_soc_dai_link {
972 987
973 /* pmdown_time is ignored at stop */ 988 /* pmdown_time is ignored at stop */
974 unsigned int ignore_pmdown_time:1; 989 unsigned int ignore_pmdown_time:1;
975
976 /* codec/machine specific init - e.g. add machine controls */
977 int (*init)(struct snd_soc_pcm_runtime *rtd);
978
979 /* optional hw_params re-writing for BE and FE sync */
980 int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
981 struct snd_pcm_hw_params *params);
982
983 /* machine stream operations */
984 const struct snd_soc_ops *ops;
985 const struct snd_soc_compr_ops *compr_ops;
986
987 /* For unidirectional dai links */
988 bool playback_only;
989 bool capture_only;
990}; 990};
991 991
992struct snd_soc_codec_conf { 992struct snd_soc_codec_conf {