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

ASoC: intel: sst-haswell-pcm: 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/87pnjfaf2u.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:31:21 +09:00 committed by Mark Brown
parent 8ec241c495
commit 86c05f3446
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sound/soc/intel/haswell/sst-haswell-pcm.c
View File

@ -458,12 +458,12 @@ static int create_adsp_page_table(struct snd_pcm_substream *substream,
} }
/* this may get called several times by oss emulation */ /* this may get called several times by oss emulation */
static int hsw_pcm_hw_params(struct snd_pcm_substream *substream, static int hsw_pcm_hw_params(struct snd_soc_component *component,
struct snd_pcm_hw_params *params) struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component); struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);
struct hsw_pcm_data *pcm_data; struct hsw_pcm_data *pcm_data;
struct sst_hsw *hsw = pdata->hsw; struct sst_hsw *hsw = pdata->hsw;
@ -656,16 +656,17 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream,
return 0; return 0;
} }
static int hsw_pcm_hw_free(struct snd_pcm_substream *substream) static int hsw_pcm_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
snd_pcm_lib_free_pages(substream); snd_pcm_lib_free_pages(substream);
return 0; return 0;
} }
static int hsw_pcm_trigger(struct snd_pcm_substream *substream, int cmd) static int hsw_pcm_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component); struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);
struct hsw_pcm_data *pcm_data; struct hsw_pcm_data *pcm_data;
struct sst_hsw_stream *sst_stream; struct sst_hsw_stream *sst_stream;
@ -770,11 +771,11 @@ static u32 hsw_notify_pointer(struct sst_hsw_stream *stream, void *data)
return pos; return pos;
} }
static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_pcm_substream *substream) static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component); struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);
struct hsw_pcm_data *pcm_data; struct hsw_pcm_data *pcm_data;
struct sst_hsw *hsw = pdata->hsw; struct sst_hsw *hsw = pdata->hsw;
@ -795,10 +796,21 @@ static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_pcm_substream *substream)
return offset; return offset;
} }
static int hsw_pcm_open(struct snd_pcm_substream *substream) #ifdef CONFIG_SND_DMA_SGBUF
static struct page *hsw_pcm_page(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
unsigned long offset)
{
return snd_pcm_sgbuf_ops_page(substream, offset);
}
#else
#define hsw_pcm_page NULL
#endif /* CONFIG_SND_DMA_SGBUF */
static int hsw_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component); struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);
struct hsw_pcm_data *pcm_data; struct hsw_pcm_data *pcm_data;
struct sst_hsw *hsw = pdata->hsw; struct sst_hsw *hsw = pdata->hsw;
@ -828,10 +840,10 @@ static int hsw_pcm_open(struct snd_pcm_substream *substream)
return 0; return 0;
} }
static int hsw_pcm_close(struct snd_pcm_substream *substream) static int hsw_pcm_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component); struct hsw_priv_data *pdata = snd_soc_component_get_drvdata(component);
struct hsw_pcm_data *pcm_data; struct hsw_pcm_data *pcm_data;
struct sst_hsw *hsw = pdata->hsw; struct sst_hsw *hsw = pdata->hsw;
@ -862,17 +874,6 @@ out:
return ret; return ret;
} }
static const struct snd_pcm_ops hsw_pcm_ops = {
.open = hsw_pcm_open,
.close = hsw_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.hw_params = hsw_pcm_hw_params,
.hw_free = hsw_pcm_hw_free,
.trigger = hsw_pcm_trigger,
.pointer = hsw_pcm_pointer,
.page = snd_pcm_sgbuf_ops_page,
};
static int hsw_pcm_create_modules(struct hsw_priv_data *pdata) static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)
{ {
struct sst_hsw *hsw = pdata->hsw; struct sst_hsw *hsw = pdata->hsw;
@ -930,10 +931,10 @@ static void hsw_pcm_free_modules(struct hsw_priv_data *pdata)
} }
} }
static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd) static int hsw_pcm_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_pcm *pcm = rtd->pcm; struct snd_pcm *pcm = rtd->pcm;
struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct sst_pdata *pdata = dev_get_platdata(component->dev); struct sst_pdata *pdata = dev_get_platdata(component->dev);
struct hsw_priv_data *priv_data = dev_get_drvdata(component->dev); struct hsw_priv_data *priv_data = dev_get_drvdata(component->dev);
struct device *dev = pdata->dma_dev; struct device *dev = pdata->dma_dev;
@ -1121,8 +1122,15 @@ static const struct snd_soc_component_driver hsw_dai_component = {
.name = DRV_NAME, .name = DRV_NAME,
.probe = hsw_pcm_probe, .probe = hsw_pcm_probe,
.remove = hsw_pcm_remove, .remove = hsw_pcm_remove,
.ops = &hsw_pcm_ops, .open = hsw_pcm_open,
.pcm_new = hsw_pcm_new, .close = hsw_pcm_close,
.hw_params = hsw_pcm_hw_params,
.hw_free = hsw_pcm_hw_free,
.trigger = hsw_pcm_trigger,
.pointer = hsw_pcm_pointer,
.page = hsw_pcm_page,
.ioctl = snd_soc_pcm_lib_ioctl,
.pcm_construct = hsw_pcm_new,
.controls = hsw_volume_controls, .controls = hsw_volume_controls,
.num_controls = ARRAY_SIZE(hsw_volume_controls), .num_controls = ARRAY_SIZE(hsw_volume_controls),
.dapm_widgets = widgets, .dapm_widgets = widgets,