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

ASoC: qcom: lpass-platform: remove snd_pcm_ops 



snd_pcm_ops is no longer needed.
Let's use component driver callback.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87tv8r90eu.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/qcom/lpass-platform.c

+34 −36
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ static const struct snd_pcm_hardware lpass_platform_pcm_hardware = { 
	.fifo_size		=	0,

};



static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream)

static int lpass_platform_pcmops_open(struct snd_soc_component *component,

				      struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

	struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	int ret, dma_ch, dir = substream->stream;
@@ -105,11 +105,10 @@ static int lpass_platform_pcmops_open(struct snd_pcm_substream *substream) 
	return 0;

}



static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream)

static int lpass_platform_pcmops_close(struct snd_soc_component *component,

				       struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct lpass_variant *v = drvdata->variant;

	struct lpass_pcm_data *data;
@@ -122,11 +121,11 @@ static int lpass_platform_pcmops_close(struct snd_pcm_substream *substream) 
	return 0;

}



static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,

static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component,

					   struct snd_pcm_substream *substream,

					   struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -216,10 +215,10 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream)

static int lpass_platform_pcmops_hw_free(struct snd_soc_component *component,

					 struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -236,11 +235,11 @@ static int lpass_platform_pcmops_hw_free(struct snd_pcm_substream *substream) 
	return ret;

}



static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream)

static int lpass_platform_pcmops_prepare(struct snd_soc_component *component,

					 struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -288,11 +287,11 @@ static int lpass_platform_pcmops_prepare(struct snd_pcm_substream *substream) 
	return 0;

}



static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream,

static int lpass_platform_pcmops_trigger(struct snd_soc_component *component,

					 struct snd_pcm_substream *substream,

					 int cmd)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -363,10 +362,10 @@ static int lpass_platform_pcmops_trigger(struct snd_pcm_substream *substream, 
}



static snd_pcm_uframes_t lpass_platform_pcmops_pointer(

		struct snd_soc_component *component,

		struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *soc_runtime = substream->private_data;

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

	struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);

	struct snd_pcm_runtime *rt = substream->runtime;

	struct lpass_pcm_data *pcm_data = rt->private_data;
@@ -395,7 +394,8 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer( 
	return bytes_to_frames(substream->runtime, curr_addr - base_addr);

}



static int lpass_platform_pcmops_mmap(struct snd_pcm_substream *substream,

static int lpass_platform_pcmops_mmap(struct snd_soc_component *component,

				      struct snd_pcm_substream *substream,

				      struct vm_area_struct *vma)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -405,18 +405,6 @@ static int lpass_platform_pcmops_mmap(struct snd_pcm_substream *substream, 
			runtime->dma_bytes);

}



static const struct snd_pcm_ops lpass_platform_pcm_ops = {

	.open		= lpass_platform_pcmops_open,

	.close		= lpass_platform_pcmops_close,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= lpass_platform_pcmops_hw_params,

	.hw_free	= lpass_platform_pcmops_hw_free,

	.prepare	= lpass_platform_pcmops_prepare,

	.trigger	= lpass_platform_pcmops_trigger,

	.pointer	= lpass_platform_pcmops_pointer,

	.mmap		= lpass_platform_pcmops_mmap,

};



static irqreturn_t lpass_dma_interrupt_handler(

			struct snd_pcm_substream *substream,

			struct lpass_data *drvdata,
@@ -499,11 +487,11 @@ static irqreturn_t lpass_platform_lpaif_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime)

static int lpass_platform_pcm_new(struct snd_soc_component *component,

				  struct snd_soc_pcm_runtime *soc_runtime)

{

	struct snd_pcm *pcm = soc_runtime->pcm;

	struct snd_pcm_substream *psubstream, *csubstream;

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

	int ret = -EINVAL;

	size_t size = lpass_platform_pcm_hardware.buffer_bytes_max;
@@ -535,7 +523,8 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
	return 0;

}



static void lpass_platform_pcm_free(struct snd_pcm *pcm)

static void lpass_platform_pcm_free(struct snd_soc_component *component,

				    struct snd_pcm *pcm)

{

	struct snd_pcm_substream *substream;

	int i;
@@ -552,9 +541,18 @@ static void lpass_platform_pcm_free(struct snd_pcm *pcm) 


static const struct snd_soc_component_driver lpass_component_driver = {

	.name		= DRV_NAME,

	.pcm_new	= lpass_platform_pcm_new,

	.pcm_free	= lpass_platform_pcm_free,

	.ops		= &lpass_platform_pcm_ops,

	.open		= lpass_platform_pcmops_open,

	.close		= lpass_platform_pcmops_close,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.hw_params	= lpass_platform_pcmops_hw_params,

	.hw_free	= lpass_platform_pcmops_hw_free,

	.prepare	= lpass_platform_pcmops_prepare,

	.trigger	= lpass_platform_pcmops_trigger,

	.pointer	= lpass_platform_pcmops_pointer,

	.mmap		= lpass_platform_pcmops_mmap,

	.pcm_construct	= lpass_platform_pcm_new,

	.pcm_destruct	= lpass_platform_pcm_free,



};



int asoc_qcom_lpass_platform_register(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE