Unverified Commit 3a5ccf25 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: codec: wm_adsp: use snd_compress_ops 



We can use snd_compress_ops.
Let's switch to use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87tv1evdlu.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c6cb522c

sound/soc/codecs/cs47l15.c

+4 −5
Original line number Diff line number Diff line
@@ -1229,11 +1229,10 @@ static struct snd_soc_dai_driver cs47l15_dai[] = { 
	},

};



static int cs47l15_open(struct snd_compr_stream *stream)

static int cs47l15_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 cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);

	struct madera_priv *priv = &cs47l15->core;

	struct madera *madera = priv->madera;
@@ -1329,7 +1328,7 @@ static unsigned int cs47l15_digital_vu[] = { 
	MADERA_DAC_DIGITAL_VOLUME_5R,

};



static const struct snd_compr_ops cs47l15_compr_ops = {

static const struct snd_compress_ops cs47l15_compress_ops = {

	.open = &cs47l15_open,

	.free = &wm_adsp_compr_free,

	.set_params = &wm_adsp_compr_set_params,
@@ -1345,7 +1344,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l15 = { 
	.set_sysclk		= &madera_set_sysclk,

	.set_pll		= &cs47l15_set_fll,

	.name			= DRV_NAME,

	.compr_ops		= &cs47l15_compr_ops,

	.compress_ops		= &cs47l15_compress_ops,

	.controls		= cs47l15_snd_controls,

	.num_controls		= ARRAY_SIZE(cs47l15_snd_controls),

	.dapm_widgets		= cs47l15_dapm_widgets,

sound/soc/codecs/cs47l24.c

+4 −4
Original line number Diff line number Diff line
@@ -1068,10 +1068,10 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { 
	},

};



static int cs47l24_open(struct snd_compr_stream *stream)

static int cs47l24_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 cs47l24_priv *priv = snd_soc_component_get_drvdata(component);

	struct arizona *arizona = priv->core.arizona;

	int n_adsp;
@@ -1178,7 +1178,7 @@ static unsigned int cs47l24_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_4L,

};



static struct snd_compr_ops cs47l24_compr_ops = {

static struct snd_compress_ops cs47l24_compress_ops = {

	.open		= cs47l24_open,

	.free		= wm_adsp_compr_free,

	.set_params	= wm_adsp_compr_set_params,
@@ -1194,7 +1194,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l24 = { 
	.set_sysclk		= arizona_set_sysclk,

	.set_pll		= cs47l24_set_fll,

	.name			= DRV_NAME,

	.compr_ops		= &cs47l24_compr_ops,

	.compress_ops		= &cs47l24_compress_ops,

	.controls		= cs47l24_snd_controls,

	.num_controls		= ARRAY_SIZE(cs47l24_snd_controls),

	.dapm_widgets		= cs47l24_dapm_widgets,

sound/soc/codecs/cs47l35.c

+4 −5
Original line number Diff line number Diff line
@@ -1504,11 +1504,10 @@ static struct snd_soc_dai_driver cs47l35_dai[] = { 
	},

};



static int cs47l35_open(struct snd_compr_stream *stream)

static int cs47l35_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 cs47l35 *cs47l35 = snd_soc_component_get_drvdata(component);

	struct madera_priv *priv = &cs47l35->core;

	struct madera *madera = priv->madera;
@@ -1622,7 +1621,7 @@ static unsigned int cs47l35_digital_vu[] = { 
	MADERA_DAC_DIGITAL_VOLUME_5R,

};



static const struct snd_compr_ops cs47l35_compr_ops = {

static const struct snd_compress_ops cs47l35_compress_ops = {

	.open = &cs47l35_open,

	.free = &wm_adsp_compr_free,

	.set_params = &wm_adsp_compr_set_params,
@@ -1638,7 +1637,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l35 = { 
	.set_sysclk		= &madera_set_sysclk,

	.set_pll		= &cs47l35_set_fll,

	.name			= DRV_NAME,

	.compr_ops		= &cs47l35_compr_ops,

	.compress_ops		= &cs47l35_compress_ops,

	.controls		= cs47l35_snd_controls,

	.num_controls		= ARRAY_SIZE(cs47l35_snd_controls),

	.dapm_widgets		= cs47l35_dapm_widgets,

sound/soc/codecs/cs47l85.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/cs47l90.c

+4 −5
Original line number Diff line number Diff line
@@ -2358,11 +2358,10 @@ static struct snd_soc_dai_driver cs47l90_dai[] = { 
	},

};



static int cs47l90_open(struct snd_compr_stream *stream)

static int cs47l90_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 cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component);

	struct madera_priv *priv = &cs47l90->core;

	struct madera *madera = priv->madera;
@@ -2473,7 +2472,7 @@ static unsigned int cs47l90_digital_vu[] = { 
	MADERA_DAC_DIGITAL_VOLUME_5R,

};



static const struct snd_compr_ops cs47l90_compr_ops = {

static const struct snd_compress_ops cs47l90_compress_ops = {

	.open = &cs47l90_open,

	.free = &wm_adsp_compr_free,

	.set_params = &wm_adsp_compr_set_params,
@@ -2489,7 +2488,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs47l90 = { 
	.set_sysclk		= &madera_set_sysclk,

	.set_pll		= &cs47l90_set_fll,

	.name			= DRV_NAME,

	.compr_ops		= &cs47l90_compr_ops,

	.compress_ops		= &cs47l90_compress_ops,

	.controls		= cs47l90_snd_controls,

	.num_controls		= ARRAY_SIZE(cs47l90_snd_controls),

	.dapm_widgets		= cs47l90_dapm_widgets,