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 {
 
         enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
 
+        /* codec/machine specific init - e.g. add machine controls */
+        int (*init)(struct snd_soc_pcm_runtime *rtd);
+
+        /* optional hw_params re-writing for BE and FE sync */
+        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+                        struct snd_pcm_hw_params *params);
+
+        /* machine stream operations */
+        const struct snd_soc_ops *ops;
+        const struct snd_soc_compr_ops *compr_ops;
+
+        /* For unidirectional dai links */
+        bool playback_only;
+        bool capture_only;
+
+        /* Mark this pcm with non atomic ops */
+        bool nonatomic;
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
@@ -957,9 +975,6 @@ struct snd_soc_dai_link {
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
 
-        /* Mark this pcm with non atomic ops */
-        bool nonatomic;
-
         /* Do not create a PCM for this DAI link (Backend link) */
         unsigned int no_pcm:1;
 
@@ -972,21 +987,6 @@ struct snd_soc_dai_link {
 
         /* pmdown_time is ignored at stop */
         unsigned int ignore_pmdown_time:1;
-
-        /* codec/machine specific init - e.g. add machine controls */
-        int (*init)(struct snd_soc_pcm_runtime *rtd);
-
-        /* optional hw_params re-writing for BE and FE sync */
-        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
-                        struct snd_pcm_hw_params *params);
-
-        /* machine stream operations */
-        const struct snd_soc_ops *ops;
-        const struct snd_soc_compr_ops *compr_ops;
-
-        /* For unidirectional dai links */
-        bool playback_only;
-        bool capture_only;
 };
 
 struct snd_soc_codec_conf {