korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 17:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-core: remove legacy style dai_link

Browse Source 
All drivers switched to modern style dai_link
(= struct snd_soc_dai_link_component).
Let's remove legacy style dai_link.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-06 13:22:19 +09:00 committed by Mark Brown
parent e1684073ef
commit adb76b5b9c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 12 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
include/sound/soc.h
View File

@ -900,17 +900,6 @@ struct snd_soc_dai_link {
const char *name; /* Codec name */
const char *stream_name; /* Stream name */
/*
* cpu_name
* cpu_of_node
* cpu_dai_name
*
* These are legacy style, and will be replaced to
* modern style (= snd_soc_dai_link_component) in the future,
* but, not yet supported so far.
* If modern style was supported for CPU, all driver will switch
* to use it, and, legacy style code will be removed from ALSA SoC.
*/
/*
* You MAY specify the link's CPU-side device, either by device name,
* or by DT/OF node, but not both. If this information is omitted,
@ -918,60 +907,27 @@ struct snd_soc_dai_link {
* must be globally unique. These fields are currently typically used
* only for codec to codec links, or systems using device tree.
*/
const char *cpu_name;
struct device_node *cpu_of_node;
/*
* You MAY specify the DAI name of the CPU DAI. If this information is
* omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node
* only, which only works well when that device exposes a single DAI.
*/
const char *cpu_dai_name;
struct snd_soc_dai_link_component *cpus;
unsigned int num_cpus;
/*
* codec_name
* codec_of_node
* codec_dai_name
*
* These are legacy style, it will be converted to modern style
* (= snd_soc_dai_link_component) automatically in soc-core
* if driver is using legacy style.
* Driver shouldn't use both legacy and modern style in the same time.
* If modern style was supported for CPU, all driver will switch
* to use it, and, legacy style code will be removed from ALSA SoC.
*/
/*
* You MUST specify the link's codec, either by device name, or by
* DT/OF node, but not both.
*/
const char *codec_name;
struct device_node *codec_of_node;
/* You MUST specify the DAI name within the codec */
const char *codec_dai_name;
struct snd_soc_dai_link_component *codecs;
unsigned int num_codecs;
/*
* platform_name
* platform_of_node
*
* These are legacy style, it will be converted to modern style
* (= snd_soc_dai_link_component) automatically in soc-core
* if driver is using legacy style.
* Driver shouldn't use both legacy and modern style in the same time.
* If modern style was supported for CPU, all driver will switch
* to use it, and, legacy style code will be removed from ALSA SoC.
*/
/*
* You MAY specify the link's platform/PCM/DMA driver, either by
* device name, or by DT/OF node, but not both. Some forms of link
* do not need a platform.
*/
const char *platform_name;
struct device_node *platform_of_node;
struct snd_soc_dai_link_component *platforms;
unsigned int num_platforms;
@ -1033,13 +989,6 @@ struct snd_soc_dai_link {
/* Do not create a PCM for this DAI link (Backend link) */
unsigned int ignore:1;
/*
* This driver uses legacy platform naming. Set by the core, machine
* drivers should not modify this value.
*/
unsigned int legacy_platform:1;
unsigned int legacy_cpu:1;
struct list_head list; /* DAI link list of the soc card */
struct snd_soc_dobj dobj; /* For topology */
};
@ -1699,15 +1648,11 @@ int snd_soc_fixup_dai_links_platform_name(struct snd_soc_card *card,
if (!name)
return -ENOMEM;
if (dai_link->platforms)
/* only single platform is supported for now */
dai_link->platforms->name = name;
else
/*
* legacy mode, this case will be removed when all
* derivers are switched to modern style dai_link.
*/
dai_link->platform_name = name;
if (!dai_link->platforms)
return -EINVAL;
/* only single platform is supported for now */
dai_link->platforms->name = name;
}
return 0;

165
sound/soc/soc-core.c
View File

@ -1053,167 +1053,18 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
}
}
static int snd_soc_init_cpu(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dai_link_component *cpu = dai_link->cpus;
/*
* REMOVE ME
*
* This is glue code for Legacy vs Modern dai_link.
* This function will be removed if all derivers are switched to
* modern style dai_link.
* Driver shouldn't use both legacy and modern style in the same time.
* see
* soc.h :: struct snd_soc_dai_link
*/
/* convert Legacy platform link */
if (!cpu) {
cpu = devm_kzalloc(card->dev,
sizeof(struct snd_soc_dai_link_component),
GFP_KERNEL);
if (!cpu)
return -ENOMEM;
dai_link->cpus = cpu;
dai_link->num_cpus = 1;
dai_link->legacy_cpu = 1;
cpu->name = dai_link->cpu_name;
cpu->of_node = dai_link->cpu_of_node;
cpu->dai_name = dai_link->cpu_dai_name;
}
if (!dai_link->cpus) {
dev_err(card->dev, "ASoC: DAI link has no CPUs\n");
return -EINVAL;
}
return 0;
}
static int snd_soc_init_platform(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dai_link_component *platform = dai_link->platforms;
/*
* REMOVE ME
*
* This is glue code for Legacy vs Modern dai_link.
* This function will be removed if all derivers are switched to
* modern style dai_link.
* Driver shouldn't use both legacy and modern style in the same time.
* see
* soc.h :: struct snd_soc_dai_link
*/
/* convert Legacy platform link */
if (!platform) {
platform = devm_kzalloc(card->dev,
sizeof(struct snd_soc_dai_link_component),
GFP_KERNEL);
if (!platform)
return -ENOMEM;
dai_link->platforms = platform;
dai_link->num_platforms = 1;
dai_link->legacy_platform = 1;
platform->name = dai_link->platform_name;
platform->of_node = dai_link->platform_of_node;
platform->dai_name = NULL;
}
/* if there's no platform we match on the empty platform */
if (!platform->name &&
!platform->of_node)
platform->name = "snd-soc-dummy";
return 0;
}
static void soc_cleanup_legacy(struct snd_soc_card *card)
{
struct snd_soc_dai_link *link;
int i;
/*
* FIXME
*
* this function should be removed with snd_soc_init_platform
*/
for_each_card_prelinks(card, i, link) {
if (link->legacy_platform) {
link->legacy_platform = 0;
link->platforms = NULL;
}
if (link->legacy_cpu) {
link->legacy_cpu = 0;
link->cpus = NULL;
}
}
}
static int snd_soc_init_multicodec(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
/*
* REMOVE ME
*
* This is glue code for Legacy vs Modern dai_link.
* This function will be removed if all derivers are switched to
* modern style dai_link.
* Driver shouldn't use both legacy and modern style in the same time.
* see
* soc.h :: struct snd_soc_dai_link
*/
/* Legacy codec/codec_dai link is a single entry in multicodec */
if (dai_link->codec_name || dai_link->codec_of_node ||
dai_link->codec_dai_name) {
dai_link->num_codecs = 1;
dai_link->codecs = devm_kzalloc(card->dev,
sizeof(struct snd_soc_dai_link_component),
GFP_KERNEL);
if (!dai_link->codecs)
return -ENOMEM;
dai_link->codecs[0].name = dai_link->codec_name;
dai_link->codecs[0].of_node = dai_link->codec_of_node;
dai_link->codecs[0].dai_name = dai_link->codec_dai_name;
}
if (!dai_link->codecs) {
dev_err(card->dev, "ASoC: DAI link has no CODECs\n");
return -EINVAL;
}
return 0;
}
static struct snd_soc_dai_link_component dummy_link = COMP_DUMMY();
static int soc_init_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *link)
{
int i, ret;
int i;
struct snd_soc_dai_link_component *codec;
ret = snd_soc_init_cpu(card, link);
if (ret) {
dev_err(card->dev, "ASoC: failed to init cpu\n");
return ret;
}
ret = snd_soc_init_platform(card, link);
if (ret) {
dev_err(card->dev, "ASoC: failed to init multiplatform\n");
return ret;
}
ret = snd_soc_init_multicodec(card, link);
if (ret) {
dev_err(card->dev, "ASoC: failed to init multicodec\n");
return ret;
/* default Platform */
if (!link->platforms || !link->num_platforms) {
link->platforms = &dummy_link;
link->num_platforms = 1;
}
for_each_link_codecs(link, i, codec) {
@ -2060,7 +1911,7 @@ match:
card->dai_link[i].name);
/* override platform component */
if (snd_soc_init_platform(card, dai_link) < 0) {
if (!dai_link->platforms) {
dev_err(card->dev, "init platform error");
continue;
}
@ -2111,7 +1962,6 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
/* remove and free each DAI */
soc_remove_dai_links(card);
soc_remove_pcm_runtimes(card);
soc_cleanup_legacy(card);
/* remove auxiliary devices */
soc_remove_aux_devices(card);
@ -2868,7 +2718,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
ret = soc_init_dai_link(card, link);
if (ret) {
soc_cleanup_legacy(card);
dev_err(card->dev, "ASoC: failed to init link %s\n",
link->name);
mutex_unlock(&client_mutex);