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

ASoC: samsung: idma: 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/87v9t790f2.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/samsung/idma.c

+32 −26
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static void idma_done(void *id, int bytes_xfer) 
		snd_pcm_period_elapsed(substream);

}



static int idma_hw_params(struct snd_pcm_substream *substream,

static int idma_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;
@@ -163,14 +164,16 @@ static int idma_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int idma_hw_free(struct snd_pcm_substream *substream)

static int idma_hw_free(struct snd_soc_component *component,

			struct snd_pcm_substream *substream)

{

	snd_pcm_set_runtime_buffer(substream, NULL);



	return 0;

}



static int idma_prepare(struct snd_pcm_substream *substream)

static int idma_prepare(struct snd_soc_component *component,

			struct snd_pcm_substream *substream)

{

	struct idma_ctrl *prtd = substream->runtime->private_data;
@@ -183,7 +186,8 @@ static int idma_prepare(struct snd_pcm_substream *substream) 
	return 0;

}



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

static int idma_trigger(struct snd_soc_component *component,

			struct snd_pcm_substream *substream, int cmd)

{

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

	int ret = 0;
@@ -216,7 +220,8 @@ static int idma_trigger(struct snd_pcm_substream *substream, int cmd) 
}



static snd_pcm_uframes_t

	idma_pointer(struct snd_pcm_substream *substream)

idma_pointer(struct snd_soc_component *component,

	     struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct idma_ctrl *prtd = runtime->private_data;
@@ -233,7 +238,8 @@ static snd_pcm_uframes_t 
	return bytes_to_frames(substream->runtime, res);

}



static int idma_mmap(struct snd_pcm_substream *substream,

static int idma_mmap(struct snd_soc_component *component,

		     struct snd_pcm_substream *substream,

	struct vm_area_struct *vma)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -278,7 +284,8 @@ static irqreturn_t iis_irq(int irqno, void *dev_id) 
	return IRQ_HANDLED;

}



static int idma_open(struct snd_pcm_substream *substream)

static int idma_open(struct snd_soc_component *component,

		     struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct idma_ctrl *prtd;
@@ -304,7 +311,8 @@ static int idma_open(struct snd_pcm_substream *substream) 
	return 0;

}



static int idma_close(struct snd_pcm_substream *substream)

static int idma_close(struct snd_soc_component *component,

		      struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct idma_ctrl *prtd = runtime->private_data;
@@ -319,19 +327,8 @@ static int idma_close(struct snd_pcm_substream *substream) 
	return 0;

}



static const struct snd_pcm_ops idma_ops = {

	.open		= idma_open,

	.close		= idma_close,

	.ioctl		= snd_pcm_lib_ioctl,

	.trigger	= idma_trigger,

	.pointer	= idma_pointer,

	.mmap		= idma_mmap,

	.hw_params	= idma_hw_params,

	.hw_free	= idma_hw_free,

	.prepare	= idma_prepare,

};



static void idma_free(struct snd_pcm *pcm)

static void idma_free(struct snd_soc_component *component,

		      struct snd_pcm *pcm)

{

	struct snd_pcm_substream *substream;

	struct snd_dma_buffer *buf;
@@ -367,7 +364,8 @@ static int preallocate_idma_buffer(struct snd_pcm *pcm, int stream) 
	return 0;

}



static int idma_new(struct snd_soc_pcm_runtime *rtd)

static int idma_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;
@@ -394,9 +392,17 @@ void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr) 
EXPORT_SYMBOL_GPL(idma_reg_addr_init);



static const struct snd_soc_component_driver asoc_idma_platform = {

	.ops = &idma_ops,

	.pcm_new = idma_new,

	.pcm_free = idma_free,

	.open		= idma_open,

	.close		= idma_close,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.trigger	= idma_trigger,

	.pointer	= idma_pointer,

	.mmap		= idma_mmap,

	.hw_params	= idma_hw_params,

	.hw_free	= idma_hw_free,

	.prepare	= idma_prepare,

	.pcm_construct	= idma_new,

	.pcm_destruct	= idma_free,

};



static int asoc_idma_platform_probe(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE