ASoC: fsl: 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/87wlzcjyrn.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
index 348b0aabfa683031662dfac0ee4c973129b18044..5aa96af994c41a46a70a297b160a10ef6f24a803 100644 (file)
--- a/sound/soc/fsl/fsl_asrc_dma.c
+++ b/sound/soc/fsl/fsl_asrc_dma.c
@@ -505,7 +505,7 @@ struct snd_soc_component_driver fsl_asrc_component = {
        .open           = fsl_asrc_dma_startup,
        .close          = fsl_asrc_dma_shutdown,
        .pointer        = fsl_asrc_dma_pcm_pointer,
-       .pcm_construct  = fsl_asrc_dma_pcm_new,
+       .pcm_new        = fsl_asrc_dma_pcm_new,
        .legacy_dai_naming = 1,
 #ifdef CONFIG_DEBUG_FS
        .debugfs_prefix = "asrc",

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 26ddbe867b5814bff5cb0a073098aa9cad111b1c..b120b3514fbec15efdd1bc1f03b4e3d1b1494faa 100644 (file)
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -860,7 +860,7 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
        dma->dai.hw_params = fsl_dma_hw_params;
        dma->dai.hw_free = fsl_dma_hw_free;
        dma->dai.pointer = fsl_dma_pointer;
-       dma->dai.pcm_construct = fsl_dma_new;
+       dma->dai.pcm_new = fsl_dma_new;
 
        /* Store the SSI-specific information that we need */
        dma->ssi_stx_phys = res.start + REG_SSI_STX0;

diff --git a/sound/soc/fsl/fsl_qmc_audio.c b/sound/soc/fsl/fsl_qmc_audio.c
index 43d401ae2d03e693a2a4670afeea535e8c3828d6..76e014dfb6d7b451412217b523ea835819eb1309 100644 (file)
--- a/sound/soc/fsl/fsl_qmc_audio.c
+++ b/sound/soc/fsl/fsl_qmc_audio.c
@@ -54,8 +54,8 @@ struct qmc_dai_prtd {
        struct snd_pcm_substream *substream;
 };
 
-static int qmc_audio_pcm_construct(struct snd_soc_component *component,
-                                  struct snd_soc_pcm_runtime *rtd)
+static int qmc_audio_pcm_new(struct snd_soc_component *component,
+                            struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_card *card = rtd->card->snd_card;
        int ret;
@@ -340,7 +340,7 @@ static const struct snd_soc_component_driver qmc_audio_soc_platform = {
        .hw_params              = qmc_audio_pcm_hw_params,
        .trigger                = qmc_audio_pcm_trigger,
        .pointer                = qmc_audio_pcm_pointer,
-       .pcm_construct          = qmc_audio_pcm_construct,
+       .pcm_new                = qmc_audio_pcm_new,
        .of_xlate_dai_name      = qmc_audio_of_xlate_dai_name,
 };
 

diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index d51a3de493cb5ace9e4be676067ae8ecc8abd78d..e0fb4f8fd52287de43479f710cb30fe1256e7c33 100644 (file)
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -273,8 +273,8 @@ static const struct snd_soc_component_driver imx_soc_component_fiq = {
        .prepare        = snd_imx_pcm_prepare,
        .trigger        = snd_imx_pcm_trigger,
        .pointer        = snd_imx_pcm_pointer,
-       .pcm_construct  = snd_imx_pcm_new,
-       .pcm_destruct   = snd_imx_pcm_free,
+       .pcm_new        = snd_imx_pcm_new,
+       .pcm_free       = snd_imx_pcm_free,
 };
 
 int imx_pcm_fiq_init(struct platform_device *pdev,

diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c
index edab68ae836659a7081a16b4f32801945dafefa3..031e5272215d45895e18e6f5fbb5206385394936 100644 (file)
--- a/sound/soc/fsl/imx-pcm-rpmsg.c
+++ b/sound/soc/fsl/imx-pcm-rpmsg.c
@@ -624,7 +624,7 @@ static int imx_rpmsg_pcm_new(struct snd_soc_component *component,
 
 static const struct snd_soc_component_driver imx_rpmsg_soc_component = {
        .name           = IMX_PCM_DRV_NAME,
-       .pcm_construct  = imx_rpmsg_pcm_new,
+       .pcm_new        = imx_rpmsg_pcm_new,
        .open           = imx_rpmsg_pcm_open,
        .close          = imx_rpmsg_pcm_close,
        .hw_params      = imx_rpmsg_pcm_hw_params,

diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index a593a95aa532e0432bf6a0fe24e2010589a5d899..ee4fb5c932cae91cbcebaacad3539d4072288644 100644 (file)
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -307,7 +307,7 @@ static const struct snd_soc_component_driver mpc5200_audio_dma_component = {
        .close          = psc_dma_close,
        .pointer        = psc_dma_pointer,
        .trigger        = psc_dma_trigger,
-       .pcm_construct  = psc_dma_new,
+       .pcm_new        = psc_dma_new,
 };
 
 int mpc5200_audio_dma_create(struct platform_device *op)