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

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


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

sound/soc/dwc/dwc-pcm.c

+26 −22
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ void dw_pcm_pop_rx(struct dw_i2s_dev *dev) 
	dw_pcm_transfer(dev, false);

}



static int dw_pcm_open(struct snd_pcm_substream *substream)

static int dw_pcm_open(struct snd_soc_component *component,

		       struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -148,13 +149,15 @@ static int dw_pcm_open(struct snd_pcm_substream *substream) 
	return 0;

}



static int dw_pcm_close(struct snd_pcm_substream *substream)

static int dw_pcm_close(struct snd_soc_component *component,

			struct snd_pcm_substream *substream)

{

	synchronize_rcu();

	return 0;

}



static int dw_pcm_hw_params(struct snd_pcm_substream *substream,

static int dw_pcm_hw_params(struct snd_soc_component *component,

			    struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *hw_params)

{

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -192,12 +195,14 @@ static int dw_pcm_hw_params(struct snd_pcm_substream *substream, 
		return 0;

}



static int dw_pcm_hw_free(struct snd_pcm_substream *substream)

static int dw_pcm_hw_free(struct snd_soc_component *component,

			  struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_pages(substream);

}



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

static int dw_pcm_trigger(struct snd_soc_component *component,

			  struct snd_pcm_substream *substream, int cmd)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct dw_i2s_dev *dev = runtime->private_data;
@@ -231,7 +236,8 @@ static int dw_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
	return ret;

}



static snd_pcm_uframes_t dw_pcm_pointer(struct snd_pcm_substream *substream)

static snd_pcm_uframes_t dw_pcm_pointer(struct snd_soc_component *component,

					struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct dw_i2s_dev *dev = runtime->private_data;
@@ -245,7 +251,8 @@ static snd_pcm_uframes_t dw_pcm_pointer(struct snd_pcm_substream *substream) 
	return pos < runtime->buffer_size ? pos : 0;

}



static int dw_pcm_new(struct snd_soc_pcm_runtime *rtd)

static int dw_pcm_new(struct snd_soc_component *component,

		      struct snd_soc_pcm_runtime *rtd)

{

	size_t size = dw_pcm_hardware.buffer_bytes_max;
@@ -255,25 +262,22 @@ static int dw_pcm_new(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static void dw_pcm_free(struct snd_pcm *pcm)

static void dw_pcm_free(struct snd_soc_component *component,

			struct snd_pcm *pcm)

{

	snd_pcm_lib_preallocate_free_for_all(pcm);

}



static const struct snd_pcm_ops dw_pcm_ops = {

static const struct snd_soc_component_driver dw_pcm_component = {

	.open		= dw_pcm_open,

	.close		= dw_pcm_close,

	.ioctl = snd_pcm_lib_ioctl,

	.ioctl		= snd_soc_pcm_lib_ioctl,

	.hw_params	= dw_pcm_hw_params,

	.hw_free	= dw_pcm_hw_free,

	.trigger	= dw_pcm_trigger,

	.pointer	= dw_pcm_pointer,

};



static const struct snd_soc_component_driver dw_pcm_component = {

	.pcm_new = dw_pcm_new,

	.pcm_free = dw_pcm_free,

	.ops = &dw_pcm_ops,

	.pcm_construct	= dw_pcm_new,

	.pcm_destruct	= dw_pcm_free,

};



int dw_pcm_register(struct platform_device *pdev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE