diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-01 15:01:15 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-01 15:01:15 +0300 |
| commit | 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a (patch) | |
| tree | 23c64d19f8d321a501f9e3567befc527c0fe1d55 /sound/soc/codecs/cs47l85.c | |
| parent | a72ff08faf3d6b2a1c21c9b815bf02af44cc70ab (diff) | |
| parent | a6b675a89e51a1cdad0481b809b7840d3f86e4b5 (diff) | |
| download | linux-358c7c61fd04d324f83d7968daf8dd9a6ff86a9a.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/cs47l85.c')
| -rw-r--r-- | sound/soc/codecs/cs47l85.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index a575113207f0..9de991adad74 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -2447,11 +2447,10 @@ static struct snd_soc_dai_driver cs47l85_dai[] = { }, }; -static int cs47l85_open(struct snd_compr_stream *stream) +static int cs47l85_open(struct snd_soc_component *component, + struct snd_compr_stream *stream) { struct snd_soc_pcm_runtime *rtd = stream->private_data; - struct snd_soc_component *component = - snd_soc_rtdcom_lookup(rtd, DRV_NAME); struct cs47l85 *cs47l85 = snd_soc_component_get_drvdata(component); struct madera_priv *priv = &cs47l85->core; struct madera *madera = priv->madera; @@ -2566,7 +2565,7 @@ static const unsigned int cs47l85_digital_vu[] = { MADERA_DAC_DIGITAL_VOLUME_6R, }; -static const struct snd_compr_ops cs47l85_compr_ops = { +static const struct snd_compress_ops cs47l85_compress_ops = { .open = &cs47l85_open, .free = &wm_adsp_compr_free, .set_params = &wm_adsp_compr_set_params, @@ -2582,7 +2581,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l85 = { .set_sysclk = &madera_set_sysclk, .set_pll = &cs47l85_set_fll, .name = DRV_NAME, - .compr_ops = &cs47l85_compr_ops, + .compress_ops = &cs47l85_compress_ops, .controls = cs47l85_snd_controls, .num_controls = ARRAY_SIZE(cs47l85_snd_controls), .dapm_widgets = cs47l85_dapm_widgets, |