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

ASoC: fsl: imx-pcm-fiq: 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/87d0ff90d6.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/imx-pcm-fiq.c

+31 −25
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static struct fiq_handler fh = { 
	.name		= DRV_NAME,

};



static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,

static int snd_imx_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;
@@ -85,7 +86,8 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)

static int snd_imx_pcm_prepare(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
@@ -104,7 +106,8 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) 


static int imx_pcm_fiq;



static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)

static int snd_imx_pcm_trigger(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream, int cmd)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
@@ -141,7 +144,9 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
	return 0;

}



static snd_pcm_uframes_t snd_imx_pcm_pointer(struct snd_pcm_substream *substream)

static snd_pcm_uframes_t

snd_imx_pcm_pointer(struct snd_soc_component *component,

		    struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
@@ -165,7 +170,8 @@ static const struct snd_pcm_hardware snd_imx_hardware = { 
	.fifo_size = 0,

};



static int snd_imx_open(struct snd_pcm_substream *substream)

static int snd_imx_open(struct snd_soc_component *component,

			struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd;
@@ -194,7 +200,8 @@ static int snd_imx_open(struct snd_pcm_substream *substream) 
	return 0;

}



static int snd_imx_close(struct snd_pcm_substream *substream)

static int snd_imx_close(struct snd_soc_component *component,

			 struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;
@@ -206,7 +213,8 @@ static int snd_imx_close(struct snd_pcm_substream *substream) 
	return 0;

}



static int snd_imx_pcm_mmap(struct snd_pcm_substream *substream,

static int snd_imx_pcm_mmap(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream,

			    struct vm_area_struct *vma)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -222,17 +230,6 @@ static int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, 
	return ret;

}



static const struct snd_pcm_ops imx_pcm_ops = {

	.open		= snd_imx_open,

	.close		= snd_imx_close,

	.ioctl		= snd_pcm_lib_ioctl,

	.hw_params	= snd_imx_pcm_hw_params,

	.prepare	= snd_imx_pcm_prepare,

	.trigger	= snd_imx_pcm_trigger,

	.pointer	= snd_imx_pcm_pointer,

	.mmap		= snd_imx_pcm_mmap,

};



static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)

{

	struct snd_pcm_substream *substream = pcm->streams[stream].substream;
@@ -279,7 +276,8 @@ static int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) 


static int ssi_irq;



static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)

static int snd_imx_pcm_new(struct snd_soc_component *component,

			   struct snd_soc_pcm_runtime *rtd)

{

	struct snd_pcm *pcm = rtd->pcm;

	struct snd_pcm_substream *substream;
@@ -329,7 +327,8 @@ static void imx_pcm_free(struct snd_pcm *pcm) 
	}

}



static void imx_pcm_fiq_free(struct snd_pcm *pcm)

static void snd_imx_pcm_free(struct snd_soc_component *component,

			     struct snd_pcm *pcm)

{

	mxc_set_irq_fiq(ssi_irq, 0);

	release_fiq(&fh);
@@ -337,9 +336,16 @@ static void imx_pcm_fiq_free(struct snd_pcm *pcm) 
}



static const struct snd_soc_component_driver imx_soc_component_fiq = {

	.ops		= &imx_pcm_ops,

	.pcm_new	= imx_pcm_fiq_new,

	.pcm_free	= imx_pcm_fiq_free,

	.open		= snd_imx_open,

	.close		= snd_imx_close,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.hw_params	= snd_imx_pcm_hw_params,

	.prepare	= snd_imx_pcm_prepare,

	.trigger	= snd_imx_pcm_trigger,

	.pointer	= snd_imx_pcm_pointer,

	.mmap		= snd_imx_pcm_mmap,

	.pcm_construct	= snd_imx_pcm_new,

	.pcm_destruct	= snd_imx_pcm_free,

};



int imx_pcm_fiq_init(struct platform_device *pdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE