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

ASoC: atmel: atmel-pcm-pdc: 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/87h84raf1o.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/atmel/atmel-pcm-pdc.c

+26 −22
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, 
	return 0;

}



static int atmel_pcm_mmap(struct snd_pcm_substream *substream,

static int atmel_pcm_mmap(struct snd_soc_component *component,

			  struct snd_pcm_substream *substream,

			  struct vm_area_struct *vma)

{

	return remap_pfn_range(vma, vma->vm_start,
@@ -64,7 +65,8 @@ static int atmel_pcm_mmap(struct snd_pcm_substream *substream, 
		       vma->vm_end - vma->vm_start, vma->vm_page_prot);

}



static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

static int atmel_pcm_new(struct snd_soc_component *component,

			 struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;
@@ -93,7 +95,8 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	return ret;

}



static void atmel_pcm_free(struct snd_pcm *pcm)

static void atmel_pcm_free(struct snd_soc_component *component,

			   struct snd_pcm *pcm)

{

	struct snd_pcm_substream *substream;

	struct snd_dma_buffer *buf;
@@ -196,7 +199,8 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, 
/*--------------------------------------------------------------------------*\

 * PCM operations

\*--------------------------------------------------------------------------*/

static int atmel_pcm_hw_params(struct snd_pcm_substream *substream,

static int atmel_pcm_hw_params(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream,

			       struct snd_pcm_hw_params *params)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -225,7 +229,8 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int atmel_pcm_hw_free(struct snd_pcm_substream *substream)

static int atmel_pcm_hw_free(struct snd_soc_component *component,

			     struct snd_pcm_substream *substream)

{

	struct atmel_runtime_data *prtd = substream->runtime->private_data;

	struct atmel_pcm_dma_params *params = prtd->params;
@@ -239,7 +244,8 @@ static int atmel_pcm_hw_free(struct snd_pcm_substream *substream) 
	return 0;

}



static int atmel_pcm_prepare(struct snd_pcm_substream *substream)

static int atmel_pcm_prepare(struct snd_soc_component *component,

			     struct snd_pcm_substream *substream)

{

	struct atmel_runtime_data *prtd = substream->runtime->private_data;

	struct atmel_pcm_dma_params *params = prtd->params;
@@ -251,8 +257,8 @@ static int atmel_pcm_prepare(struct snd_pcm_substream *substream) 
	return 0;

}



static int atmel_pcm_trigger(struct snd_pcm_substream *substream,

	int cmd)

static int atmel_pcm_trigger(struct snd_soc_component *component,

			     struct snd_pcm_substream *substream, int cmd)

{

	struct snd_pcm_runtime *rtd = substream->runtime;

	struct atmel_runtime_data *prtd = rtd->private_data;
@@ -317,7 +323,7 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream, 
	return ret;

}



static snd_pcm_uframes_t atmel_pcm_pointer(

static snd_pcm_uframes_t atmel_pcm_pointer(struct snd_soc_component *component,

					   struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -335,7 +341,8 @@ static snd_pcm_uframes_t atmel_pcm_pointer( 
	return x;

}



static int atmel_pcm_open(struct snd_pcm_substream *substream)

static int atmel_pcm_open(struct snd_soc_component *component,

			  struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct atmel_runtime_data *prtd;
@@ -360,7 +367,8 @@ static int atmel_pcm_open(struct snd_pcm_substream *substream) 
	return ret;

}



static int atmel_pcm_close(struct snd_pcm_substream *substream)

static int atmel_pcm_close(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream)

{

	struct atmel_runtime_data *prtd = substream->runtime->private_data;
@@ -368,22 +376,18 @@ static int atmel_pcm_close(struct snd_pcm_substream *substream) 
	return 0;

}



static const struct snd_pcm_ops atmel_pcm_ops = {

static const struct snd_soc_component_driver atmel_soc_platform = {

	.open		= atmel_pcm_open,

	.close		= atmel_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.hw_params	= atmel_pcm_hw_params,

	.hw_free	= atmel_pcm_hw_free,

	.prepare	= atmel_pcm_prepare,

	.trigger	= atmel_pcm_trigger,

	.pointer	= atmel_pcm_pointer,

	.mmap		= atmel_pcm_mmap,

};



static struct snd_soc_component_driver atmel_soc_platform = {

	.ops		= &atmel_pcm_ops,

	.pcm_new	= atmel_pcm_new,

	.pcm_free	= atmel_pcm_free,

	.pcm_construct	= atmel_pcm_new,

	.pcm_destruct	= atmel_pcm_free,

};



int atmel_pcm_pdc_platform_register(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE