leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rt5514-spi: remove snd_pcm_ops

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ftkb90df.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-10-02 14:34:20 +09:00 committed by Mark Brown
parent dfd00af5e8
commit 85efbc911e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sound/soc/codecs/rt5514-spi.c
View File

@ -201,18 +201,18 @@ static irqreturn_t rt5514_spi_irq(int irq, void *data)
} }
/* PCM for streaming audio from the DSP buffer */ /* PCM for streaming audio from the DSP buffer */
static int rt5514_spi_pcm_open(struct snd_pcm_substream *substream) static int rt5514_spi_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
snd_soc_set_runtime_hwparams(substream, &rt5514_spi_pcm_hardware); snd_soc_set_runtime_hwparams(substream, &rt5514_spi_pcm_hardware);
return 0; return 0;
} }
static int rt5514_spi_hw_params(struct snd_pcm_substream *substream, static int rt5514_spi_hw_params(struct snd_soc_component *component,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct rt5514_dsp *rt5514_dsp = struct rt5514_dsp *rt5514_dsp =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
int ret; int ret;
@ -234,10 +234,9 @@ static int rt5514_spi_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static int rt5514_spi_hw_free(struct snd_pcm_substream *substream) static int rt5514_spi_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct rt5514_dsp *rt5514_dsp = struct rt5514_dsp *rt5514_dsp =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
@ -251,24 +250,22 @@ static int rt5514_spi_hw_free(struct snd_pcm_substream *substream)
} }
static snd_pcm_uframes_t rt5514_spi_pcm_pointer( static snd_pcm_uframes_t rt5514_spi_pcm_pointer(
struct snd_soc_component *component,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct rt5514_dsp *rt5514_dsp = struct rt5514_dsp *rt5514_dsp =
snd_soc_component_get_drvdata(component); snd_soc_component_get_drvdata(component);
return bytes_to_frames(runtime, rt5514_dsp->dma_offset); return bytes_to_frames(runtime, rt5514_dsp->dma_offset);
} }
static const struct snd_pcm_ops rt5514_spi_pcm_ops = { static struct page *rt5514_spi_pcm_page(struct snd_soc_component *component,
.open = rt5514_spi_pcm_open, struct snd_pcm_substream *substream,
.hw_params = rt5514_spi_hw_params, unsigned long offset)
.hw_free = rt5514_spi_hw_free, {
.pointer = rt5514_spi_pcm_pointer, return snd_pcm_lib_get_vmalloc_page(substream, offset);
.page = snd_pcm_lib_get_vmalloc_page, }
};
static int rt5514_spi_pcm_probe(struct snd_soc_component *component) static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
{ {
@ -302,9 +299,13 @@ static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
} }
static const struct snd_soc_component_driver rt5514_spi_component = { static const struct snd_soc_component_driver rt5514_spi_component = {
.name = DRV_NAME, .name = DRV_NAME,
.probe = rt5514_spi_pcm_probe, .probe = rt5514_spi_pcm_probe,
.ops = &rt5514_spi_pcm_ops, .open = rt5514_spi_pcm_open,
.hw_params = rt5514_spi_hw_params,
.hw_free = rt5514_spi_hw_free,
.pointer = rt5514_spi_pcm_pointer,
.page = rt5514_spi_pcm_page,
}; };
/** /**