[1/3] ASoC: soc.h: tidyup struct snd_soc_dai_link definition order

Commit Message

Kuninori Morimoto April 21, 2015, 7:02 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

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 <[e-mail]>
---
 include/sound/soc.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

Comments

Mark Brown April 27, 2015, 8:13 p.m. UTC | #1

On Tue, Apr 21, 2015 at 07:02:34AM +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <[e-mail]>
> 
> 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.

Applied, thanks.

Patch

diff --git a/include/sound/soc.h b/include/sound/soc.h
index f6226914..183cbb7 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -961,6 +961,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;
 
@@ -969,9 +987,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;
 
@@ -984,21 +999,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 {