korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 06:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: sh: Migrate to new style legacy DAI naming flag

Browse Source 
Change the legacy DAI naming flag from opting in to the new scheme
(non_legacy_dai_naming), to opting out of it (legacy_dai_naming).
These drivers appear to be on the CPU side of the DAI link and
currently uses the legacy naming, so add the new flag.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-11-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2022-06-23 13:51:24 +01:00 committed by Mark Brown
parent b9a0db0ae5
commit f712ff57a2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/sh/hac.c
View File

@ -307,7 +307,8 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = {
}; };
static const struct snd_soc_component_driver sh4_hac_component = { static const struct snd_soc_component_driver sh4_hac_component = {
.name = "sh4-hac", .name = "sh4-hac",
.legacy_dai_naming = 1,
}; };
static int hac_soc_platform_probe(struct platform_device *pdev) static int hac_soc_platform_probe(struct platform_device *pdev)

11
sound/soc/sh/rcar/core.c
View File

@ -1813,11 +1813,12 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
* snd_soc_component * snd_soc_component
*/ */
static const struct snd_soc_component_driver rsnd_soc_component = { static const struct snd_soc_component_driver rsnd_soc_component = {
.name = "rsnd", .name = "rsnd",
.probe = rsnd_debugfs_probe, .probe = rsnd_debugfs_probe,
.hw_params = rsnd_hw_params, .hw_params = rsnd_hw_params,
.hw_free = rsnd_hw_free, .hw_free = rsnd_hw_free,
.pointer = rsnd_pointer, .pointer = rsnd_pointer,
.legacy_dai_naming = 1,
}; };
static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv, static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,

9
sound/soc/sh/rz-ssi.c
View File

@ -906,10 +906,11 @@ static struct snd_soc_dai_driver rz_ssi_soc_dai[] = {
}; };
static const struct snd_soc_component_driver rz_ssi_soc_component = { static const struct snd_soc_component_driver rz_ssi_soc_component = {
.name = "rz-ssi", .name = "rz-ssi",
.open = rz_ssi_pcm_open, .open = rz_ssi_pcm_open,
.pointer = rz_ssi_pcm_pointer, .pointer = rz_ssi_pcm_pointer,
.pcm_construct = rz_ssi_pcm_new, .pcm_construct = rz_ssi_pcm_new,
.legacy_dai_naming = 1,
}; };
static int rz_ssi_probe(struct platform_device *pdev) static int rz_ssi_probe(struct platform_device *pdev)

17
sound/soc/sh/siu_pcm.c
View File

@ -540,13 +540,14 @@ static void siu_pcm_free(struct snd_soc_component *component,
} }
const struct snd_soc_component_driver siu_component = { const struct snd_soc_component_driver siu_component = {
.name = DRV_NAME, .name = DRV_NAME,
.open = siu_pcm_open, .open = siu_pcm_open,
.close = siu_pcm_close, .close = siu_pcm_close,
.prepare = siu_pcm_prepare, .prepare = siu_pcm_prepare,
.trigger = siu_pcm_trigger, .trigger = siu_pcm_trigger,
.pointer = siu_pcm_pointer_dma, .pointer = siu_pcm_pointer_dma,
.pcm_construct = siu_pcm_new, .pcm_construct = siu_pcm_new,
.pcm_destruct = siu_pcm_free, .pcm_destruct = siu_pcm_free,
.legacy_dai_naming = 1,
}; };
EXPORT_SYMBOL_GPL(siu_component); EXPORT_SYMBOL_GPL(siu_component);

3
sound/soc/sh/ssi.c
View File

@ -377,7 +377,8 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = {
}; };
static const struct snd_soc_component_driver sh4_ssi_component = { static const struct snd_soc_component_driver sh4_ssi_component = {
.name = "sh4-ssi", .name = "sh4-ssi",
.legacy_dai_naming = 1,
}; };
static int sh4_soc_dai_probe(struct platform_device *pdev) static int sh4_soc_dai_probe(struct platform_device *pdev)