Merge remote-tracking branch 'asoc/topic/const' into asoc-next
This commit is contained in:
commit
0314f6947c
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -998,7 +998,6 @@ static irqreturn_t mbhc_btn_press_irq_handler(int irq, void *arg)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
static irqreturn_t pm8916_mbhc_switch_irq_handler(int irq, void *arg)
|
||||
{
|
||||
struct pm8916_wcd_analog_priv *priv = arg;
|
||||
|
|
|
@ -1265,7 +1265,7 @@ static int rt5616_resume(struct snd_soc_codec *codec)
|
|||
#define RT5616_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
|
||||
|
||||
static struct snd_soc_dai_ops rt5616_aif_dai_ops = {
|
||||
static const struct snd_soc_dai_ops rt5616_aif_dai_ops = {
|
||||
.hw_params = rt5616_hw_params,
|
||||
.set_fmt = rt5616_set_dai_fmt,
|
||||
.set_sysclk = rt5616_set_dai_sysclk,
|
||||
|
|
|
@ -2860,7 +2860,7 @@ static int rt5663_resume(struct snd_soc_codec *codec)
|
|||
#define RT5663_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
|
||||
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S8)
|
||||
|
||||
static struct snd_soc_dai_ops rt5663_aif_dai_ops = {
|
||||
static const struct snd_soc_dai_ops rt5663_aif_dai_ops = {
|
||||
.hw_params = rt5663_hw_params,
|
||||
.set_fmt = rt5663_set_dai_fmt,
|
||||
.set_sysclk = rt5663_set_dai_sysclk,
|
||||
|
|
|
@ -507,7 +507,7 @@ static const struct snd_soc_codec_driver soc_codec_dev_tas5720 = {
|
|||
#define TAS5720_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE |\
|
||||
SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE)
|
||||
|
||||
static struct snd_soc_dai_ops tas5720_speaker_dai_ops = {
|
||||
static const struct snd_soc_dai_ops tas5720_speaker_dai_ops = {
|
||||
.hw_params = tas5720_hw_params,
|
||||
.set_fmt = tas5720_set_dai_fmt,
|
||||
.set_tdm_slot = tas5720_set_dai_tdm_slot,
|
||||
|
|
|
@ -312,7 +312,7 @@ static int aud96p22_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_soc_dai_ops aud96p22_dai_ops = {
|
||||
static const struct snd_soc_dai_ops aud96p22_dai_ops = {
|
||||
.set_fmt = aud96p22_set_fmt,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue