Skip to content

Commit

Permalink
ASoC: soc.h: tidyup struct snd_soc_dai_link definition order
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Apr 27, 2015
1 parent b787f68 commit 2dc0f16
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand All @@ -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 {
Expand Down

0 comments on commit 2dc0f16

Please sign in to comment.