Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0314f694 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/const' into asoc-next

parents 2e700424 f13db334

sound/soc/codecs/cs42l42.c

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ static int cs42l42_digital_mute(struct snd_soc_dai *dai, int mute) 
			SNDRV_PCM_FMTBIT_S32_LE)





static struct snd_soc_dai_ops cs42l42_ops = {

static const struct snd_soc_dai_ops cs42l42_ops = {

	.hw_params	= cs42l42_pcm_hw_params,

	.set_fmt	= cs42l42_set_dai_fmt,

	.set_sysclk	= cs42l42_set_sysclk,

sound/soc/codecs/es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int es8316_mute(struct snd_soc_dai *dai, int mute) 
#define ES8316_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \

			SNDRV_PCM_FMTBIT_S24_LE)



static struct snd_soc_dai_ops es8316_ops = {

static const struct snd_soc_dai_ops es8316_ops = {

	.startup = es8316_pcm_startup,

	.hw_params = es8316_pcm_hw_params,

	.set_fmt = es8316_set_dai_fmt,

sound/soc/codecs/inno_rk3036.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int rk3036_codec_dai_hw_params(struct snd_pcm_substream *substream, 
			   SNDRV_PCM_FMTBIT_S24_LE  | \

			   SNDRV_PCM_FMTBIT_S32_LE)



static struct snd_soc_dai_ops rk3036_codec_dai_ops = {

static const struct snd_soc_dai_ops rk3036_codec_dai_ops = {

	.set_fmt	= rk3036_codec_dai_set_fmt,

	.hw_params	= rk3036_codec_dai_hw_params,

};

sound/soc/codecs/max9867.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai, 
	return 0;

}



static struct snd_soc_dai_ops max9867_dai_ops = {

static const struct snd_soc_dai_ops max9867_dai_ops = {

	.set_fmt = max9867_dai_set_fmt,

	.set_sysclk	= max9867_set_dai_sysclk,

	.prepare	= max9867_prepare,

sound/soc/codecs/max98926.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int max98926_dai_hw_params(struct snd_pcm_substream *substream, 
#define MAX98926_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \

		SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)



static struct snd_soc_dai_ops max98926_dai_ops = {

static const struct snd_soc_dai_ops max98926_dai_ops = {

	.set_fmt = max98926_dai_set_fmt,

	.hw_params = max98926_dai_hw_params,

};