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] commit c64bfc906600 ("ASoC: soc-core: add new pcm_construct/pcmdestruct")
[2] commit e9067bb50278 ("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>

diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 67caea39b55708b6c097a50a72f81a0e4e5697d4..f074af2499c8332cd551786b32863c0b8350b415 100644 (file)
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -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)

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index d53c2f76fcd40e47284454e607ca2d0ff5f9cbe9..797b9c9163b492d07f202aeb7f199821c6b57ea2 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -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

diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c
index 8356dbdb2809cb3f06fc463c17813bf672fbe7d9..7b2bab12c70759225b9cdbffc379bb7fd3ae23e1 100644 (file)
--- a/sound/soc/intel/catpt/pcm.c
+++ b/sound/soc/intel/catpt/pcm.c
@@ -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,
 

diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c
index 4ed71d11ad7784586fac67b6efc60954ecffa85e..6659e8060ef3a9dc274aa8ad2deb8e4bd840720e 100644 (file)
--- a/sound/soc/intel/keembay/kmb_platform.c
+++ b/sound/soc/intel/keembay/kmb_platform.c
@@ -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,