Merge remote-tracking branches 'asoc/topic/compress', 'asoc/topic/const' and 'asoc/topic/cs35l34' into asoc-next
This commit is contained in:
@@ -156,7 +156,7 @@ static int bdw_rt5677_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops bdw_rt5677_ops = {
|
||||
static const struct snd_soc_ops bdw_rt5677_ops = {
|
||||
.hw_params = bdw_rt5677_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -259,7 +259,7 @@ static int broxton_da7219_hw_free(struct snd_pcm_substream *substream)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops broxton_da7219_ops = {
|
||||
static const struct snd_soc_ops broxton_da7219_ops = {
|
||||
.hw_params = broxton_da7219_hw_params,
|
||||
.hw_free = broxton_da7219_hw_free,
|
||||
};
|
||||
@@ -309,7 +309,7 @@ static int broxton_refcap_startup(struct snd_pcm_substream *substream)
|
||||
&constraints_16000);
|
||||
};
|
||||
|
||||
static struct snd_soc_ops broxton_refcap_ops = {
|
||||
static const struct snd_soc_ops broxton_refcap_ops = {
|
||||
.startup = broxton_refcap_startup,
|
||||
};
|
||||
|
||||
|
@@ -181,7 +181,7 @@ static int broxton_rt298_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops broxton_rt298_ops = {
|
||||
static const struct snd_soc_ops broxton_rt298_ops = {
|
||||
.hw_params = broxton_rt298_hw_params,
|
||||
};
|
||||
|
||||
@@ -230,7 +230,7 @@ static int broxton_dmic_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops broxton_dmic_ops = {
|
||||
static const struct snd_soc_ops broxton_dmic_ops = {
|
||||
.startup = broxton_dmic_startup,
|
||||
};
|
||||
|
||||
|
@@ -595,11 +595,11 @@ static int byt_rt5640_aif1_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, 48000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops byt_rt5640_aif1_ops = {
|
||||
static const struct snd_soc_ops byt_rt5640_aif1_ops = {
|
||||
.startup = byt_rt5640_aif1_startup,
|
||||
};
|
||||
|
||||
static struct snd_soc_ops byt_rt5640_be_ssp2_ops = {
|
||||
static const struct snd_soc_ops byt_rt5640_be_ssp2_ops = {
|
||||
.hw_params = byt_rt5640_aif1_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -219,11 +219,11 @@ static int byt_rt5651_aif1_startup(struct snd_pcm_substream *substream)
|
||||
&constraints_48000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops byt_rt5651_aif1_ops = {
|
||||
static const struct snd_soc_ops byt_rt5651_aif1_ops = {
|
||||
.startup = byt_rt5651_aif1_startup,
|
||||
};
|
||||
|
||||
static struct snd_soc_ops byt_rt5651_be_ssp2_ops = {
|
||||
static const struct snd_soc_ops byt_rt5651_be_ssp2_ops = {
|
||||
.hw_params = byt_rt5651_aif1_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -204,11 +204,11 @@ static int cht_max98090_headset_init(struct snd_soc_component *component)
|
||||
return ts3a227e_enable_jack_detect(component, &ctx->jack);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops cht_aif1_ops = {
|
||||
static const struct snd_soc_ops cht_aif1_ops = {
|
||||
.startup = cht_aif1_startup,
|
||||
};
|
||||
|
||||
static struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
static const struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
.hw_params = cht_aif1_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -251,11 +251,11 @@ static int cht_aif1_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, 48000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops cht_aif1_ops = {
|
||||
static const struct snd_soc_ops cht_aif1_ops = {
|
||||
.startup = cht_aif1_startup,
|
||||
};
|
||||
|
||||
static struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
static const struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
.hw_params = cht_aif1_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -227,11 +227,11 @@ static int cht_aif1_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, 48000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops cht_aif1_ops = {
|
||||
static const struct snd_soc_ops cht_aif1_ops = {
|
||||
.startup = cht_aif1_startup,
|
||||
};
|
||||
|
||||
static struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
static const struct snd_soc_ops cht_be_ssp2_ops = {
|
||||
.hw_params = cht_aif1_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -81,7 +81,7 @@ static int haswell_rt5640_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops haswell_rt5640_ops = {
|
||||
static const struct snd_soc_ops haswell_rt5640_ops = {
|
||||
.hw_params = haswell_rt5640_hw_params,
|
||||
};
|
||||
|
||||
|
@@ -332,7 +332,7 @@ static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_nau8825_ops = {
|
||||
static const struct snd_soc_ops skylake_nau8825_ops = {
|
||||
.hw_params = skylake_nau8825_hw_params,
|
||||
};
|
||||
|
||||
@@ -382,7 +382,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_dmic_ops = {
|
||||
static const struct snd_soc_ops skylake_dmic_ops = {
|
||||
.startup = skylake_dmic_startup,
|
||||
};
|
||||
|
||||
@@ -416,7 +416,7 @@ static int skylake_refcap_startup(struct snd_pcm_substream *substream)
|
||||
&constraints_16000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylaye_refcap_ops = {
|
||||
static const struct snd_soc_ops skylaye_refcap_ops = {
|
||||
.startup = skylake_refcap_startup,
|
||||
};
|
||||
|
||||
|
@@ -394,7 +394,7 @@ static int skylake_nau8825_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_nau8825_ops = {
|
||||
static const struct snd_soc_ops skylake_nau8825_ops = {
|
||||
.hw_params = skylake_nau8825_hw_params,
|
||||
};
|
||||
|
||||
@@ -430,7 +430,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_dmic_ops = {
|
||||
static const struct snd_soc_ops skylake_dmic_ops = {
|
||||
.startup = skylake_dmic_startup,
|
||||
};
|
||||
|
||||
@@ -464,7 +464,7 @@ static int skylake_refcap_startup(struct snd_pcm_substream *substream)
|
||||
&constraints_16000);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylaye_refcap_ops = {
|
||||
static const struct snd_soc_ops skylaye_refcap_ops = {
|
||||
.startup = skylake_refcap_startup,
|
||||
};
|
||||
|
||||
|
@@ -250,7 +250,7 @@ static int skylake_rt286_hw_params(struct snd_pcm_substream *substream,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_rt286_ops = {
|
||||
static const struct snd_soc_ops skylake_rt286_ops = {
|
||||
.hw_params = skylake_rt286_hw_params,
|
||||
};
|
||||
|
||||
@@ -289,7 +289,7 @@ static int skylake_dmic_startup(struct snd_pcm_substream *substream)
|
||||
SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
|
||||
}
|
||||
|
||||
static struct snd_soc_ops skylake_dmic_ops = {
|
||||
static const struct snd_soc_ops skylake_dmic_ops = {
|
||||
.startup = skylake_dmic_startup,
|
||||
};
|
||||
|
||||
|
Verwijs in nieuw issue
Block a user