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

ASoC: intel: atom: use snd_compress_ops 



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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87pnc2vdka.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/intel/atom/sst-mfld-platform-compress.c

+25 −18
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static void sst_drain_notify(void *arg) 
		snd_compr_drain_notify(cstream);

}



static int sst_platform_compr_open(struct snd_compr_stream *cstream)

static int sst_platform_compr_open(struct snd_soc_component *component,

				   struct snd_compr_stream *cstream)

{



	int ret_val = 0;
@@ -72,7 +73,8 @@ static int sst_platform_compr_open(struct snd_compr_stream *cstream) 
	return ret_val;

}



static int sst_platform_compr_free(struct snd_compr_stream *cstream)

static int sst_platform_compr_free(struct snd_soc_component *component,

				   struct snd_compr_stream *cstream)

{

	struct sst_runtime_stream *stream;

	int ret_val = 0, str_id;
@@ -91,15 +93,14 @@ static int sst_platform_compr_free(struct snd_compr_stream *cstream) 
	return 0;

}



static int sst_platform_compr_set_params(struct snd_compr_stream *cstream,

static int sst_platform_compr_set_params(struct snd_soc_component *component,

					 struct snd_compr_stream *cstream,

					 struct snd_compr_params *params)

{

	struct sst_runtime_stream *stream;

	int retval;

	struct snd_sst_params str_params;

	struct sst_compress_cb cb;

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);

	struct sst_data *ctx = snd_soc_component_get_drvdata(component);



	stream = cstream->runtime->private_data;
@@ -166,7 +167,8 @@ static int sst_platform_compr_set_params(struct snd_compr_stream *cstream, 
	return 0;

}



static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd)

static int sst_platform_compr_trigger(struct snd_soc_component *component,

				      struct snd_compr_stream *cstream, int cmd)

{

	struct sst_runtime_stream *stream = cstream->runtime->private_data;
@@ -199,7 +201,8 @@ static int sst_platform_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	return -EINVAL;

}



static int sst_platform_compr_pointer(struct snd_compr_stream *cstream,

static int sst_platform_compr_pointer(struct snd_soc_component *component,

				      struct snd_compr_stream *cstream,

				      struct snd_compr_tstamp *tstamp)

{

	struct sst_runtime_stream *stream;
@@ -212,7 +215,8 @@ static int sst_platform_compr_pointer(struct snd_compr_stream *cstream, 
	return 0;

}



static int sst_platform_compr_ack(struct snd_compr_stream *cstream,

static int sst_platform_compr_ack(struct snd_soc_component *component,

				  struct snd_compr_stream *cstream,

				  size_t bytes)

{

	struct sst_runtime_stream *stream;
@@ -224,7 +228,8 @@ static int sst_platform_compr_ack(struct snd_compr_stream *cstream, 
	return 0;

}



static int sst_platform_compr_get_caps(struct snd_compr_stream *cstream,

static int sst_platform_compr_get_caps(struct snd_soc_component *component,

				       struct snd_compr_stream *cstream,

				       struct snd_compr_caps *caps)

{

	struct sst_runtime_stream *stream =
@@ -233,7 +238,8 @@ static int sst_platform_compr_get_caps(struct snd_compr_stream *cstream, 
	return stream->compr_ops->get_caps(caps);

}



static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream,

static int sst_platform_compr_get_codec_caps(struct snd_soc_component *component,

					     struct snd_compr_stream *cstream,

					     struct snd_compr_codec_caps *codec)

{

	struct sst_runtime_stream *stream =
@@ -242,7 +248,8 @@ static int sst_platform_compr_get_codec_caps(struct snd_compr_stream *cstream, 
	return stream->compr_ops->get_codec_caps(codec);

}



static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream,

static int sst_platform_compr_set_metadata(struct snd_soc_component *component,

					   struct snd_compr_stream *cstream,

					   struct snd_compr_metadata *metadata)

{

	struct sst_runtime_stream *stream  =
@@ -251,7 +258,7 @@ static int sst_platform_compr_set_metadata(struct snd_compr_stream *cstream, 
	return stream->compr_ops->set_metadata(sst->dev, stream->id, metadata);

}



const struct snd_compr_ops sst_platform_compr_ops = {

const struct snd_compress_ops sst_platform_compress_ops = {



	.open = sst_platform_compr_open,

	.free = sst_platform_compr_free,

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static const struct snd_soc_component_driver sst_soc_platform_drv = { 
	.open		= sst_soc_open,

	.trigger	= sst_soc_trigger,

	.pointer	= sst_soc_pointer,

	.compr_ops	= &sst_platform_compr_ops,

	.compress_ops	= &sst_platform_compress_ops,

	.pcm_construct	= sst_soc_pcm_new,

};

sound/soc/intel/atom/sst-mfld-platform.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "sst-atom-controls.h"



extern struct sst_device *sst;

extern const struct snd_compr_ops sst_platform_compr_ops;

extern const struct snd_compress_ops sst_platform_compress_ops;



#define DRV_NAME "sst"