github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 05:04:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: qcom: preparation for Card capsuling

Browse Source 
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> says:
I will post Card capsuling patch.
To makes its review easy, tidyup meson drivers to reduce
un-related diff as preparation.
No functional change, but is preparation for cleanup driver.

Link: https://patch.msgid.link/87qzkxi0j5.wl-kuninori.morimoto.gx@renesas.com
This commit is contained in:
Mark Brown 2026-07-21 19:06:45 +01:00
commit 38a4486177
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/qcom/common.c
View File

@ -91,7 +91,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
ret = of_property_read_string(np, "link-name", &link->name);
if (ret) {
dev_err(card->dev, "error getting codec dai_link name\n");
dev_err(dev, "error getting codec dai_link name\n");
return ret;
}
@ -109,7 +109,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
ret = snd_soc_of_get_dlc(cpu, &args, link->cpus, 0);
if (ret) {
dev_err_probe(card->dev, ret,
dev_err_probe(dev, ret,
"%s: error getting cpu dai name\n", link->name);
return ret;
}
@ -126,7 +126,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
"sound-dai",
0);
if (!link->platforms->of_node) {
dev_err(card->dev, "%s: platform dai not found\n", link->name);
dev_err(dev, "%s: platform dai not found\n", link->name);
return -EINVAL;
}
} else {
@ -136,7 +136,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
if (codec) {
ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
if (ret < 0) {
dev_err_probe(card->dev, ret,
dev_err_probe(dev, ret,
"%s: codec dai not found\n", link->name);
return ret;
}

2
sound/soc/qcom/sdm845.c
View File

@ -36,7 +36,6 @@ struct sdm845_snd_data {
bool jack_setup;
bool slim_port_setup;
bool stream_prepared[AFE_PORT_MAX];
struct snd_soc_card *card;
uint32_t pri_mi2s_clk_count;
uint32_t sec_mi2s_clk_count;
uint32_t quat_tdm_clk_count;
@ -564,7 +563,6 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev)
if (ret)
return ret;
data->card = card;
snd_soc_card_set_drvdata(card, data);
sdm845_add_ops(card);

12
sound/soc/qcom/storm.c
View File

@ -64,21 +64,21 @@ static struct snd_soc_dai_link storm_dai_link = {
SND_SOC_DAILINK_REG(hifi),
};
static int storm_parse_of(struct snd_soc_card *card)
static int storm_parse_of(struct device *dev)
{
struct snd_soc_dai_link *dai_link = card->dai_link;
struct device_node *np = card->dev->of_node;
struct snd_soc_dai_link *dai_link = &storm_dai_link;
struct device_node *np = dev->of_node;
dai_link->cpus->of_node = of_parse_phandle(np, "cpu", 0);
if (!dai_link->cpus->of_node) {
dev_err(card->dev, "error getting cpu phandle\n");
dev_err(dev, "error getting cpu phandle\n");
return -EINVAL;
}
dai_link->platforms->of_node = dai_link->cpus->of_node;
dai_link->codecs->of_node = of_parse_phandle(np, "codec", 0);
if (!dai_link->codecs->of_node) {
dev_err(card->dev, "error getting codec phandle\n");
dev_err(dev, "error getting codec phandle\n");
return -EINVAL;
}
@ -106,7 +106,7 @@ static int storm_platform_probe(struct platform_device *pdev)
card->dai_link = &storm_dai_link;
card->num_links = 1;
ret = storm_parse_of(card);
ret = storm_parse_of(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "error resolving dai links: %d\n", ret);
return ret;