Unverified Commit f712ff57 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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



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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-11-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b9a0db0a

sound/soc/sh/hac.c

+2 −1
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static struct snd_soc_dai_driver sh4_hac_dai[] = { 


static const struct snd_soc_component_driver sh4_hac_component = {

	.name			= "sh4-hac",

	.legacy_dai_naming	= 1,

};



static int hac_soc_platform_probe(struct platform_device *pdev)

sound/soc/sh/rcar/core.c

+6 −5
Original line number Diff line number Diff line
@@ -1818,6 +1818,7 @@ static const struct snd_soc_component_driver rsnd_soc_component = { 
	.hw_params		= rsnd_hw_params,

	.hw_free		= rsnd_hw_free,

	.pointer		= rsnd_pointer,

	.legacy_dai_naming	= 1,

};



static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,

sound/soc/sh/rz-ssi.c

+5 −4
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ static const struct snd_soc_component_driver rz_ssi_soc_component = { 
	.open			= rz_ssi_pcm_open,

	.pointer		= rz_ssi_pcm_pointer,

	.pcm_construct		= rz_ssi_pcm_new,

	.legacy_dai_naming	= 1,

};



static int rz_ssi_probe(struct platform_device *pdev)

sound/soc/sh/siu_pcm.c

+9 −8
Original line number Diff line number Diff line
@@ -548,5 +548,6 @@ const struct snd_soc_component_driver siu_component = { 
	.pointer		= siu_pcm_pointer_dma,

	.pcm_construct		= siu_pcm_new,

	.pcm_destruct		= siu_pcm_free,

	.legacy_dai_naming	= 1,

};

EXPORT_SYMBOL_GPL(siu_component);

sound/soc/sh/ssi.c

+2 −1
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ static struct snd_soc_dai_driver sh4_ssi_dai[] = { 


static const struct snd_soc_component_driver sh4_ssi_component = {

	.name			= "sh4-ssi",

	.legacy_dai_naming	= 1,

};



static int sh4_soc_dai_probe(struct platform_device *pdev)