Skip to content

Commit 2dc0f16

Browse files
morimotobroonie
authored andcommitted
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 <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent b787f68 commit 2dc0f16

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

include/sound/soc.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,24 @@ struct snd_soc_dai_link {
949949

950950
enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
951951

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+
952970
/* Keep DAI active over suspend */
953971
unsigned int ignore_suspend:1;
954972

@@ -957,9 +975,6 @@ struct snd_soc_dai_link {
957975
unsigned int symmetric_channels:1;
958976
unsigned int symmetric_samplebits:1;
959977

960-
/* Mark this pcm with non atomic ops */
961-
bool nonatomic;
962-
963978
/* Do not create a PCM for this DAI link (Backend link) */
964979
unsigned int no_pcm:1;
965980

@@ -972,21 +987,6 @@ struct snd_soc_dai_link {
972987

973988
/* pmdown_time is ignored at stop */
974989
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;
990990
};
991991

992992
struct snd_soc_codec_conf {

0 commit comments

Comments
 (0)