mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 04:21:09 -04:00
ASoC: intel: name back to pcm_new()/pcm_free()
We have been used pcm_new()/pcm_free(), but switched to pcm_construct()/pcm_destruct() to use extra parameters [1]. pcm_new()/free() had been removed [2], but each drivers are still using such function naming. Let's name back to pcm_new()/pcm_free() again. [1] commitc64bfc9066("ASoC: soc-core: add new pcm_construct/pcmdestruct") [2] commite9067bb502("ASoC: soc-component: remove snd_pcm_ops from component driver") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/87sea0jyr1.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
committed by
Mark Brown
parent
71a5590610
commit
6f2b7bd598
@@ -707,7 +707,7 @@ static const struct snd_soc_component_driver sst_soc_platform_drv = {
|
||||
.pointer = sst_soc_pointer,
|
||||
.delay = sst_soc_delay,
|
||||
.compress_ops = &sst_platform_compress_ops,
|
||||
.pcm_construct = sst_soc_pcm_new,
|
||||
.pcm_new = sst_soc_pcm_new,
|
||||
};
|
||||
|
||||
static int sst_platform_probe(struct platform_device *pdev)
|
||||
|
||||
@@ -1349,8 +1349,8 @@ static int avs_component_mmap(struct snd_soc_component *component,
|
||||
|
||||
#define MAX_PREALLOC_SIZE (32 * 1024 * 1024)
|
||||
|
||||
static int avs_component_construct(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtd)
|
||||
static int avs_component_new(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0);
|
||||
struct snd_pcm *pcm = rtd->pcm;
|
||||
@@ -1377,7 +1377,7 @@ static struct snd_soc_component_driver avs_component_driver = {
|
||||
.open = avs_component_open,
|
||||
.pointer = avs_component_pointer,
|
||||
.mmap = avs_component_mmap,
|
||||
.pcm_construct = avs_component_construct,
|
||||
.pcm_new = avs_component_new,
|
||||
.module_get_upon_open = 1, /* increment refcount when a pcm is opened */
|
||||
.topology_name_prefix = "intel/avs",
|
||||
};
|
||||
@@ -1755,7 +1755,7 @@ static struct snd_soc_component_driver avs_hda_component_driver = {
|
||||
.open = avs_component_hda_open,
|
||||
.pointer = avs_component_pointer,
|
||||
.mmap = avs_component_mmap,
|
||||
.pcm_construct = avs_component_construct,
|
||||
.pcm_new = avs_component_new,
|
||||
/*
|
||||
* hda platform component's probe() is dependent on
|
||||
* codec->pcm_list_head, it needs to be initialized after codec
|
||||
|
||||
@@ -603,8 +603,8 @@ static const struct snd_pcm_hardware catpt_pcm_hardware = {
|
||||
.buffer_bytes_max = CATPT_BUFFER_MAX_SIZE,
|
||||
};
|
||||
|
||||
static int catpt_component_pcm_construct(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtm)
|
||||
static int catpt_component_pcm_new(struct snd_soc_component *component,
|
||||
struct snd_soc_pcm_runtime *rtm)
|
||||
{
|
||||
struct catpt_dev *cdev = dev_get_drvdata(component->dev);
|
||||
|
||||
@@ -1056,7 +1056,7 @@ static const struct snd_soc_dapm_route component_routes[] = {
|
||||
static const struct snd_soc_component_driver catpt_comp_driver = {
|
||||
.name = "catpt-platform",
|
||||
|
||||
.pcm_construct = catpt_component_pcm_construct,
|
||||
.pcm_new = catpt_component_pcm_new,
|
||||
.open = catpt_component_open,
|
||||
.pointer = catpt_component_pointer,
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@ static snd_pcm_uframes_t kmb_pcm_pointer(struct snd_soc_component *component,
|
||||
|
||||
static const struct snd_soc_component_driver kmb_component = {
|
||||
.name = "kmb",
|
||||
.pcm_construct = kmb_platform_pcm_new,
|
||||
.pcm_new = kmb_platform_pcm_new,
|
||||
.open = kmb_pcm_open,
|
||||
.trigger = kmb_pcm_trigger,
|
||||
.pointer = kmb_pcm_pointer,
|
||||
|
||||
Reference in New Issue
Block a user