Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: soc-component: re-add pcm_new()/pcm_free()
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> says:
Because old pcm_new()/pcm_free() didn't care about parameter component,
to avoid name collisions, we have added pcm_construct()/pcm_destruct() by
commit c64bfc9066007 ("ASoC: soc-core: add new pcm_construct/pcm_destruct")
Because all driver switch to new pcm_construct()/pcm_destruct(), old
pcm_new()/pcm_free() were remoted by commit e9067bb502787 ("ASoC:
soc-component: remove snd_pcm_ops from component driver")
But naming of pcm_construct()/pcm_destruct() are not goot. re-add
pcm_new()/pcm_free(), and switch to use it, again.
Because it has no functional significance, 1 patch is for 1 vender.
+93
-93
+4
-4
include/sound/soc-component.h
+4
-4
include/sound/soc-component.h
···
86
86
unsigned int reg, unsigned int val);
87
87
88
88
/* pcm creation and destruction */
89
-
int (*pcm_construct)(struct snd_soc_component *component,
90
-
struct snd_soc_pcm_runtime *rtd);
91
-
void (*pcm_destruct)(struct snd_soc_component *component,
92
-
struct snd_pcm *pcm);
89
+
int (*pcm_new)(struct snd_soc_component *component,
90
+
struct snd_soc_pcm_runtime *rtd);
91
+
void (*pcm_free)(struct snd_soc_component *component,
92
+
struct snd_pcm *pcm);
93
93
94
94
/* component wide operations */
95
95
int (*set_sysclk)(struct snd_soc_component *component,
+1
-1
sound/soc/amd/acp-pcm-dma.c
+1
-1
sound/soc/amd/acp-pcm-dma.c
+1
-1
sound/soc/amd/acp/acp-platform.c
+1
-1
sound/soc/amd/acp/acp-platform.c
+1
-1
sound/soc/amd/ps/ps-pdm-dma.c
+1
-1
sound/soc/amd/ps/ps-pdm-dma.c
+1
-1
sound/soc/amd/ps/ps-sdw-dma.c
+1
-1
sound/soc/amd/ps/ps-sdw-dma.c
+1
-1
sound/soc/amd/raven/acp3x-pcm-dma.c
+1
-1
sound/soc/amd/raven/acp3x-pcm-dma.c
+1
-1
sound/soc/amd/renoir/acp3x-pdm-dma.c
+1
-1
sound/soc/amd/renoir/acp3x-pdm-dma.c
+1
-1
sound/soc/amd/vangogh/acp5x-pcm-dma.c
+1
-1
sound/soc/amd/vangogh/acp5x-pcm-dma.c
+1
-1
sound/soc/amd/yc/acp6x-pdm-dma.c
+1
-1
sound/soc/amd/yc/acp6x-pdm-dma.c
+2
-2
sound/soc/apple/mca.c
+2
-2
sound/soc/apple/mca.c
···
1002
1002
.hw_params = mca_hw_params,
1003
1003
.trigger = mca_trigger,
1004
1004
.pointer = mca_pointer,
1005
-
.pcm_construct = mca_pcm_new,
1006
-
.pcm_destruct = mca_pcm_free,
1005
+
.pcm_new = mca_pcm_new,
1006
+
.pcm_free = mca_pcm_free,
1007
1007
};
1008
1008
1009
1009
static void apple_mca_release(struct mca_data *mca)
+1
-1
sound/soc/atmel/atmel-pcm-pdc.c
+1
-1
sound/soc/atmel/atmel-pcm-pdc.c
+1
-1
sound/soc/au1x/dbdma2.c
+1
-1
sound/soc/au1x/dbdma2.c
+1
-1
sound/soc/au1x/dma.c
+1
-1
sound/soc/au1x/dma.c
+1
-1
sound/soc/bcm/bcm63xx-pcm-whistler.c
+1
-1
sound/soc/bcm/bcm63xx-pcm-whistler.c
+1
-1
sound/soc/bcm/cygnus-pcm.c
+1
-1
sound/soc/bcm/cygnus-pcm.c
+1
-1
sound/soc/codecs/cros_ec_codec.c
+1
-1
sound/soc/codecs/cros_ec_codec.c
+1
-1
sound/soc/codecs/rt5514-spi.c
+1
-1
sound/soc/codecs/rt5514-spi.c
+1
-1
sound/soc/codecs/rt5677-spi.c
+1
-1
sound/soc/codecs/rt5677-spi.c
+1
-1
sound/soc/dwc/dwc-pcm.c
+1
-1
sound/soc/dwc/dwc-pcm.c
+1
-1
sound/soc/fsl/fsl_asrc_dma.c
+1
-1
sound/soc/fsl/fsl_asrc_dma.c
···
505
505
.open = fsl_asrc_dma_startup,
506
506
.close = fsl_asrc_dma_shutdown,
507
507
.pointer = fsl_asrc_dma_pcm_pointer,
508
-
.pcm_construct = fsl_asrc_dma_pcm_new,
508
+
.pcm_new = fsl_asrc_dma_pcm_new,
509
509
.legacy_dai_naming = 1,
510
510
#ifdef CONFIG_DEBUG_FS
511
511
.debugfs_prefix = "asrc",
+1
-1
sound/soc/fsl/fsl_dma.c
+1
-1
sound/soc/fsl/fsl_dma.c
···
860
860
dma->dai.hw_params = fsl_dma_hw_params;
861
861
dma->dai.hw_free = fsl_dma_hw_free;
862
862
dma->dai.pointer = fsl_dma_pointer;
863
-
dma->dai.pcm_construct = fsl_dma_new;
863
+
dma->dai.pcm_new = fsl_dma_new;
864
864
865
865
/* Store the SSI-specific information that we need */
866
866
dma->ssi_stx_phys = res.start + REG_SSI_STX0;
+3
-3
sound/soc/fsl/fsl_qmc_audio.c
+3
-3
sound/soc/fsl/fsl_qmc_audio.c
···
54
54
struct snd_pcm_substream *substream;
55
55
};
56
56
57
-
static int qmc_audio_pcm_construct(struct snd_soc_component *component,
58
-
struct snd_soc_pcm_runtime *rtd)
57
+
static int qmc_audio_pcm_new(struct snd_soc_component *component,
58
+
struct snd_soc_pcm_runtime *rtd)
59
59
{
60
60
struct snd_card *card = rtd->card->snd_card;
61
61
int ret;
···
340
340
.hw_params = qmc_audio_pcm_hw_params,
341
341
.trigger = qmc_audio_pcm_trigger,
342
342
.pointer = qmc_audio_pcm_pointer,
343
-
.pcm_construct = qmc_audio_pcm_construct,
343
+
.pcm_new = qmc_audio_pcm_new,
344
344
.of_xlate_dai_name = qmc_audio_of_xlate_dai_name,
345
345
};
346
346
+2
-2
sound/soc/fsl/imx-pcm-fiq.c
+2
-2
sound/soc/fsl/imx-pcm-fiq.c
···
273
273
.prepare = snd_imx_pcm_prepare,
274
274
.trigger = snd_imx_pcm_trigger,
275
275
.pointer = snd_imx_pcm_pointer,
276
-
.pcm_construct = snd_imx_pcm_new,
277
-
.pcm_destruct = snd_imx_pcm_free,
276
+
.pcm_new = snd_imx_pcm_new,
277
+
.pcm_free = snd_imx_pcm_free,
278
278
};
279
279
280
280
int imx_pcm_fiq_init(struct platform_device *pdev,
+1
-1
sound/soc/fsl/imx-pcm-rpmsg.c
+1
-1
sound/soc/fsl/imx-pcm-rpmsg.c
···
624
624
625
625
static const struct snd_soc_component_driver imx_rpmsg_soc_component = {
626
626
.name = IMX_PCM_DRV_NAME,
627
-
.pcm_construct = imx_rpmsg_pcm_new,
627
+
.pcm_new = imx_rpmsg_pcm_new,
628
628
.open = imx_rpmsg_pcm_open,
629
629
.close = imx_rpmsg_pcm_close,
630
630
.hw_params = imx_rpmsg_pcm_hw_params,
+1
-1
sound/soc/fsl/mpc5200_dma.c
+1
-1
sound/soc/fsl/mpc5200_dma.c
+1
-1
sound/soc/generic/audio-graph-card.c
+1
-1
sound/soc/generic/audio-graph-card.c
+6
-6
sound/soc/generic/test-component.c
+6
-6
sound/soc/generic/test-component.c
···
273
273
}
274
274
275
275
#define PREALLOC_BUFFER (32 * 1024)
276
-
static int test_component_pcm_construct(struct snd_soc_component *component,
277
-
struct snd_soc_pcm_runtime *rtd)
276
+
static int test_component_pcm_new(struct snd_soc_component *component,
277
+
struct snd_soc_pcm_runtime *rtd)
278
278
{
279
279
mile_stone(component);
280
280
···
287
287
return 0;
288
288
}
289
289
290
-
static void test_component_pcm_destruct(struct snd_soc_component *component,
291
-
struct snd_pcm *pcm)
290
+
static void test_component_pcm_free(struct snd_soc_component *component,
291
+
struct snd_pcm *pcm)
292
292
{
293
293
mile_stone(component);
294
294
}
···
562
562
563
563
if (adata->is_cpu) {
564
564
cdriv->name = "test_cpu";
565
-
cdriv->pcm_construct = test_component_pcm_construct;
565
+
cdriv->pcm_new = test_component_pcm_new;
566
566
cdriv->pointer = test_component_pointer;
567
567
cdriv->trigger = test_component_trigger;
568
568
cdriv->legacy_dai_naming = 1;
···
597
597
cdriv->be_hw_params_fixup = test_component_be_hw_params_fixup;
598
598
599
599
if (adata->is_cpu)
600
-
cdriv->pcm_destruct = test_component_pcm_destruct;
600
+
cdriv->pcm_free = test_component_pcm_free;
601
601
}
602
602
603
603
i = 0;
+3
-3
sound/soc/google/chv3-i2s.c
+3
-3
sound/soc/google/chv3-i2s.c
···
163
163
return 0;
164
164
}
165
165
166
-
static int chv3_dma_pcm_construct(struct snd_soc_component *component,
167
-
struct snd_soc_pcm_runtime *rtd)
166
+
static int chv3_dma_pcm_new(struct snd_soc_component *component,
167
+
struct snd_soc_pcm_runtime *rtd)
168
168
{
169
169
struct chv3_i2s_dev *i2s = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
170
170
struct snd_pcm_substream *substream;
···
271
271
.name = "chv3-i2s-comp",
272
272
.open = chv3_dma_open,
273
273
.close = chv3_dma_close,
274
-
.pcm_construct = chv3_dma_pcm_construct,
274
+
.pcm_new = chv3_dma_pcm_new,
275
275
.hw_params = chv3_dma_hw_params,
276
276
.prepare = chv3_dma_prepare,
277
277
.pointer = chv3_dma_pointer,
+1
-1
sound/soc/intel/atom/sst-mfld-platform-pcm.c
+1
-1
sound/soc/intel/atom/sst-mfld-platform-pcm.c
+4
-4
sound/soc/intel/avs/pcm.c
+4
-4
sound/soc/intel/avs/pcm.c
···
1349
1349
1350
1350
#define MAX_PREALLOC_SIZE (32 * 1024 * 1024)
1351
1351
1352
-
static int avs_component_construct(struct snd_soc_component *component,
1353
-
struct snd_soc_pcm_runtime *rtd)
1352
+
static int avs_component_new(struct snd_soc_component *component,
1353
+
struct snd_soc_pcm_runtime *rtd)
1354
1354
{
1355
1355
struct snd_soc_dai *dai = snd_soc_rtd_to_cpu(rtd, 0);
1356
1356
struct snd_pcm *pcm = rtd->pcm;
···
1377
1377
.open = avs_component_open,
1378
1378
.pointer = avs_component_pointer,
1379
1379
.mmap = avs_component_mmap,
1380
-
.pcm_construct = avs_component_construct,
1380
+
.pcm_new = avs_component_new,
1381
1381
.module_get_upon_open = 1, /* increment refcount when a pcm is opened */
1382
1382
.topology_name_prefix = "intel/avs",
1383
1383
};
···
1755
1755
.open = avs_component_hda_open,
1756
1756
.pointer = avs_component_pointer,
1757
1757
.mmap = avs_component_mmap,
1758
-
.pcm_construct = avs_component_construct,
1758
+
.pcm_new = avs_component_new,
1759
1759
/*
1760
1760
* hda platform component's probe() is dependent on
1761
1761
* codec->pcm_list_head, it needs to be initialized after codec
+3
-3
sound/soc/intel/catpt/pcm.c
+3
-3
sound/soc/intel/catpt/pcm.c
···
603
603
.buffer_bytes_max = CATPT_BUFFER_MAX_SIZE,
604
604
};
605
605
606
-
static int catpt_component_pcm_construct(struct snd_soc_component *component,
607
-
struct snd_soc_pcm_runtime *rtm)
606
+
static int catpt_component_pcm_new(struct snd_soc_component *component,
607
+
struct snd_soc_pcm_runtime *rtm)
608
608
{
609
609
struct catpt_dev *cdev = dev_get_drvdata(component->dev);
610
610
···
1056
1056
static const struct snd_soc_component_driver catpt_comp_driver = {
1057
1057
.name = "catpt-platform",
1058
1058
1059
-
.pcm_construct = catpt_component_pcm_construct,
1059
+
.pcm_new = catpt_component_pcm_new,
1060
1060
.open = catpt_component_open,
1061
1061
.pointer = catpt_component_pointer,
1062
1062
+1
-1
sound/soc/intel/keembay/kmb_platform.c
+1
-1
sound/soc/intel/keembay/kmb_platform.c
+1
-1
sound/soc/kirkwood/kirkwood-dma.c
+1
-1
sound/soc/kirkwood/kirkwood-dma.c
+1
-1
sound/soc/loongson/loongson_dma.c
+1
-1
sound/soc/loongson/loongson_dma.c
+1
-1
sound/soc/mediatek/common/mtk-afe-platform-driver.c
+1
-1
sound/soc/mediatek/common/mtk-afe-platform-driver.c
···
149
149
const struct snd_soc_component_driver mtk_afe_pcm_platform = {
150
150
.name = AFE_PCM_NAME,
151
151
.pointer = mtk_afe_pcm_pointer,
152
-
.pcm_construct = mtk_afe_pcm_new,
152
+
.pcm_new = mtk_afe_pcm_new,
153
153
.probe = mtk_afe_component_probe,
154
154
};
155
155
EXPORT_SYMBOL_GPL(mtk_afe_pcm_platform);
+1
-1
sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
+1
-1
sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
···
2773
2773
2774
2774
static const struct snd_soc_component_driver mt8186_afe_component = {
2775
2775
.name = AFE_PCM_NAME,
2776
-
.pcm_construct = mtk_afe_pcm_new,
2776
+
.pcm_new = mtk_afe_pcm_new,
2777
2777
.pointer = mtk_afe_pcm_pointer,
2778
2778
.probe = mt8186_afe_component_probe,
2779
2779
};
+2
-2
sound/soc/mediatek/mt8189/mt8189-afe-pcm.c
+2
-2
sound/soc/mediatek/mt8189/mt8189-afe-pcm.c
···
2378
2378
static const struct snd_soc_component_driver mt8189_afe_component = {
2379
2379
.name = AFE_PCM_NAME,
2380
2380
.probe = mt8189_afe_component_probe,
2381
-
.pcm_construct = mtk_afe_pcm_new,
2382
-
.pcm_destruct = mt8189_afe_pcm_free,
2381
+
.pcm_new = mtk_afe_pcm_new,
2382
+
.pcm_free = mt8189_afe_pcm_free,
2383
2383
.open = mt8189_afe_pcm_open,
2384
2384
.pointer = mtk_afe_pcm_pointer,
2385
2385
};
+1
-1
sound/soc/pxa/pxa-ssp.c
+1
-1
sound/soc/pxa/pxa-ssp.c
···
843
843
844
844
static const struct snd_soc_component_driver pxa_ssp_component = {
845
845
.name = "pxa-ssp",
846
-
.pcm_construct = pxa2xx_soc_pcm_new,
846
+
.pcm_new = pxa2xx_soc_pcm_new,
847
847
.open = pxa2xx_soc_pcm_open,
848
848
.close = pxa2xx_soc_pcm_close,
849
849
.hw_params = pxa2xx_soc_pcm_hw_params,
+1
-1
sound/soc/pxa/pxa2xx-ac97.c
+1
-1
sound/soc/pxa/pxa2xx-ac97.c
···
198
198
199
199
static const struct snd_soc_component_driver pxa_ac97_component = {
200
200
.name = "pxa-ac97",
201
-
.pcm_construct = pxa2xx_soc_pcm_new,
201
+
.pcm_new = pxa2xx_soc_pcm_new,
202
202
.open = pxa2xx_soc_pcm_open,
203
203
.close = pxa2xx_soc_pcm_close,
204
204
.hw_params = pxa2xx_soc_pcm_hw_params,
+1
-1
sound/soc/pxa/pxa2xx-i2s.c
+1
-1
sound/soc/pxa/pxa2xx-i2s.c
···
356
356
357
357
static const struct snd_soc_component_driver pxa_i2s_component = {
358
358
.name = "pxa-i2s",
359
-
.pcm_construct = pxa2xx_soc_pcm_new,
359
+
.pcm_new = pxa2xx_soc_pcm_new,
360
360
.open = pxa2xx_soc_pcm_open,
361
361
.close = pxa2xx_soc_pcm_close,
362
362
.hw_params = pxa2xx_soc_pcm_hw_params,
+1
-1
sound/soc/pxa/pxa2xx-pcm.c
+1
-1
sound/soc/pxa/pxa2xx-pcm.c
···
18
18
#include <sound/dmaengine_pcm.h>
19
19
20
20
static const struct snd_soc_component_driver pxa2xx_soc_platform = {
21
-
.pcm_construct = pxa2xx_soc_pcm_new,
21
+
.pcm_new = pxa2xx_soc_pcm_new,
22
22
.open = pxa2xx_soc_pcm_open,
23
23
.close = pxa2xx_soc_pcm_close,
24
24
.hw_params = pxa2xx_soc_pcm_hw_params,
+1
-1
sound/soc/qcom/lpass-platform.c
+1
-1
sound/soc/qcom/lpass-platform.c
···
1268
1268
.trigger = lpass_platform_pcmops_trigger,
1269
1269
.pointer = lpass_platform_pcmops_pointer,
1270
1270
.mmap = lpass_platform_pcmops_mmap,
1271
-
.pcm_construct = lpass_platform_pcm_new,
1271
+
.pcm_new = lpass_platform_pcm_new,
1272
1272
.suspend = lpass_platform_pcmops_suspend,
1273
1273
.resume = lpass_platform_pcmops_resume,
1274
1274
.copy = lpass_platform_copy,
+1
-1
sound/soc/qcom/qdsp6/q6apm-dai.c
+1
-1
sound/soc/qcom/qdsp6/q6apm-dai.c
···
831
831
.open = q6apm_dai_open,
832
832
.close = q6apm_dai_close,
833
833
.prepare = q6apm_dai_prepare,
834
-
.pcm_construct = q6apm_dai_pcm_new,
834
+
.pcm_new = q6apm_dai_pcm_new,
835
835
.hw_params = q6apm_dai_hw_params,
836
836
.pointer = q6apm_dai_pointer,
837
837
.trigger = q6apm_dai_trigger,
+1
-1
sound/soc/qcom/qdsp6/q6asm-dai.c
+1
-1
sound/soc/qcom/qdsp6/q6asm-dai.c
···
1224
1224
.trigger = q6asm_dai_trigger,
1225
1225
.ack = q6asm_dai_ack,
1226
1226
.pointer = q6asm_dai_pointer,
1227
-
.pcm_construct = q6asm_dai_pcm_new,
1227
+
.pcm_new = q6asm_dai_pcm_new,
1228
1228
.compress_ops = &q6asm_dai_compress_ops,
1229
1229
.dapm_widgets = q6asm_dapm_widgets,
1230
1230
.num_dapm_widgets = ARRAY_SIZE(q6asm_dapm_widgets),
+1
-1
sound/soc/renesas/dma-sh7760.c
+1
-1
sound/soc/renesas/dma-sh7760.c
+1
-1
sound/soc/renesas/fsi.c
+1
-1
sound/soc/renesas/fsi.c
+1
-1
sound/soc/renesas/rcar/msiof.c
+1
-1
sound/soc/renesas/rcar/msiof.c
+1
-1
sound/soc/renesas/rz-ssi.c
+1
-1
sound/soc/renesas/rz-ssi.c
+2
-2
sound/soc/renesas/siu_pcm.c
+2
-2
sound/soc/renesas/siu_pcm.c
···
546
546
.prepare = siu_pcm_prepare,
547
547
.trigger = siu_pcm_trigger,
548
548
.pointer = siu_pcm_pointer_dma,
549
-
.pcm_construct = siu_pcm_new,
550
-
.pcm_destruct = siu_pcm_free,
549
+
.pcm_new = siu_pcm_new,
550
+
.pcm_free = siu_pcm_free,
551
551
.legacy_dai_naming = 1,
552
552
};
553
553
EXPORT_SYMBOL_GPL(siu_component);
+2
-2
sound/soc/samsung/idma.c
+2
-2
sound/soc/samsung/idma.c
···
399
399
.hw_params = idma_hw_params,
400
400
.hw_free = idma_hw_free,
401
401
.prepare = idma_prepare,
402
-
.pcm_construct = idma_new,
403
-
.pcm_destruct = idma_free,
402
+
.pcm_new = idma_new,
403
+
.pcm_free = idma_free,
404
404
};
405
405
406
406
static int asoc_idma_platform_probe(struct platform_device *pdev)
+4
-4
sound/soc/soc-component.c
+4
-4
sound/soc/soc-component.c
···
1037
1037
int i;
1038
1038
1039
1039
for_each_rtd_components(rtd, i, component) {
1040
-
if (component->driver->pcm_construct) {
1041
-
ret = component->driver->pcm_construct(component, rtd);
1040
+
if (component->driver->pcm_new) {
1041
+
ret = component->driver->pcm_new(component, rtd);
1042
1042
if (ret < 0)
1043
1043
return soc_component_ret(component, ret);
1044
1044
}
···
1056
1056
return;
1057
1057
1058
1058
for_each_rtd_components(rtd, i, component)
1059
-
if (component->driver->pcm_destruct)
1060
-
component->driver->pcm_destruct(component, rtd->pcm);
1059
+
if (component->driver->pcm_free)
1060
+
component->driver->pcm_free(component, rtd->pcm);
1061
1061
}
1062
1062
1063
1063
int snd_soc_pcm_component_prepare(struct snd_pcm_substream *substream)
+2
-2
sound/soc/soc-generic-dmaengine-pcm.c
+2
-2
sound/soc/soc-generic-dmaengine-pcm.c
···
332
332
.hw_params = dmaengine_pcm_hw_params,
333
333
.trigger = dmaengine_pcm_trigger,
334
334
.pointer = dmaengine_pcm_pointer,
335
-
.pcm_construct = dmaengine_pcm_new,
335
+
.pcm_new = dmaengine_pcm_new,
336
336
.sync_stop = dmaengine_pcm_sync_stop,
337
337
};
338
338
···
345
345
.trigger = dmaengine_pcm_trigger,
346
346
.pointer = dmaengine_pcm_pointer,
347
347
.copy = dmaengine_copy,
348
-
.pcm_construct = dmaengine_pcm_new,
348
+
.pcm_new = dmaengine_pcm_new,
349
349
.sync_stop = dmaengine_pcm_sync_stop,
350
350
};
351
351
+2
-2
sound/soc/sof/pcm.c
+2
-2
sound/soc/sof/pcm.c
···
651
651
return 0;
652
652
}
653
653
654
-
dev_dbg(spcm->scomp->dev, "pcm%u (%s): Entry: pcm_construct\n",
654
+
dev_dbg(spcm->scomp->dev, "pcm%u (%s): Entry: pcm_new\n",
655
655
le32_to_cpu(spcm->pcm.pcm_id), spcm->pcm.pcm_name);
656
656
657
657
/* do we need to pre-allocate playback audio buffer pages */
···
850
850
pd->compress_ops = &sof_compressed_ops;
851
851
#endif
852
852
853
-
pd->pcm_construct = sof_pcm_new;
853
+
pd->pcm_new = sof_pcm_new;
854
854
pd->ignore_machine = drv_name;
855
855
pd->be_pcm_base = SOF_BE_PCM_BASE;
856
856
pd->use_dai_pcm_id = true;
+1
-1
sound/soc/sprd/sprd-pcm-dma.c
+1
-1
sound/soc/sprd/sprd-pcm-dma.c
+1
-1
sound/soc/stm/stm32_adfsdm.c
+1
-1
sound/soc/stm/stm32_adfsdm.c
···
315
315
.hw_params = stm32_adfsdm_pcm_hw_params,
316
316
.trigger = stm32_adfsdm_trigger,
317
317
.pointer = stm32_adfsdm_pcm_pointer,
318
-
.pcm_construct = stm32_adfsdm_pcm_new,
318
+
.pcm_new = stm32_adfsdm_pcm_new,
319
319
};
320
320
321
321
static const struct of_device_id stm32_adfsdm_of_match[] = {
+3
-3
sound/soc/tegra/tegra210_admaif.c
+3
-3
sound/soc/tegra/tegra210_admaif.c
···
839
839
static const struct snd_soc_component_driver tegra210_admaif_cmpnt = {
840
840
.controls = tegra210_admaif_controls,
841
841
.num_controls = ARRAY_SIZE(tegra210_admaif_controls),
842
-
.pcm_construct = tegra_pcm_construct,
842
+
.pcm_new = tegra_pcm_new,
843
843
.open = tegra_pcm_open,
844
844
.close = tegra_pcm_close,
845
845
.hw_params = tegra_pcm_hw_params,
···
849
849
static const struct snd_soc_component_driver tegra186_admaif_cmpnt = {
850
850
.controls = tegra186_admaif_controls,
851
851
.num_controls = ARRAY_SIZE(tegra186_admaif_controls),
852
-
.pcm_construct = tegra_pcm_construct,
852
+
.pcm_new = tegra_pcm_new,
853
853
.open = tegra_pcm_open,
854
854
.close = tegra_pcm_close,
855
855
.hw_params = tegra_pcm_hw_params,
···
859
859
static const struct snd_soc_component_driver tegra264_admaif_cmpnt = {
860
860
.controls = tegra264_admaif_controls,
861
861
.num_controls = ARRAY_SIZE(tegra264_admaif_controls),
862
-
.pcm_construct = tegra_pcm_construct,
862
+
.pcm_new = tegra_pcm_new,
863
863
.open = tegra_pcm_open,
864
864
.close = tegra_pcm_close,
865
865
.hw_params = tegra_pcm_hw_params,
+3
-3
sound/soc/tegra/tegra_pcm.c
+3
-3
sound/soc/tegra/tegra_pcm.c
···
204
204
return snd_pcm_set_fixed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV_WC, dev, size);
205
205
}
206
206
207
-
int tegra_pcm_construct(struct snd_soc_component *component,
208
-
struct snd_soc_pcm_runtime *rtd)
207
+
int tegra_pcm_new(struct snd_soc_component *component,
208
+
struct snd_soc_pcm_runtime *rtd)
209
209
{
210
210
struct device *dev = component->dev;
211
211
···
218
218
219
219
return tegra_pcm_dma_allocate(dev, rtd, tegra_pcm_hardware.buffer_bytes_max);
220
220
}
221
-
EXPORT_SYMBOL_GPL(tegra_pcm_construct);
221
+
EXPORT_SYMBOL_GPL(tegra_pcm_new);
222
222
223
223
MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
224
224
MODULE_DESCRIPTION("Tegra PCM ASoC driver");
+2
-2
sound/soc/tegra/tegra_pcm.h
+2
-2
sound/soc/tegra/tegra_pcm.h
···
20
20
#include <sound/dmaengine_pcm.h>
21
21
#include <sound/asound.h>
22
22
23
-
int tegra_pcm_construct(struct snd_soc_component *component,
24
-
struct snd_soc_pcm_runtime *rtd);
23
+
int tegra_pcm_new(struct snd_soc_component *component,
24
+
struct snd_soc_pcm_runtime *rtd);
25
25
int tegra_pcm_open(struct snd_soc_component *component,
26
26
struct snd_pcm_substream *substream);
27
27
int tegra_pcm_close(struct snd_soc_component *component,
+1
-1
sound/soc/uniphier/aio-dma.c
+1
-1
sound/soc/uniphier/aio-dma.c
+1
-1
sound/soc/xilinx/xlnx_formatter_pcm.c
+1
-1
sound/soc/xilinx/xlnx_formatter_pcm.c
···
582
582
.hw_params = xlnx_formatter_pcm_hw_params,
583
583
.trigger = xlnx_formatter_pcm_trigger,
584
584
.pointer = xlnx_formatter_pcm_pointer,
585
-
.pcm_construct = xlnx_formatter_pcm_new,
585
+
.pcm_new = xlnx_formatter_pcm_new,
586
586
};
587
587
588
588
static int xlnx_formatter_pcm_probe(struct platform_device *pdev)