Skip to content

ASoC: sdw_utils: remove dai registered check #5629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bardliao wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
+0 −15
Draft

ASoC: sdw_utils: remove dai registered check #5629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions sound/soc/sdw_utils/soc_sdw_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,29 +1380,14 @@ static int is_sdca_endpoint_present(struct device *dev,
const struct snd_soc_acpi_adr_device *adr_dev = &adr_link->adr_d[adr_index];
const struct snd_soc_acpi_endpoint *adr_end;
const struct asoc_sdw_dai_info *dai_info;
struct snd_soc_dai_link_component *dlc;
Copy link
Collaborator

@ranj063 ranj063 Dec 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao Can we drop the first sentence in the commit message and say that checking for a registered DAI for non-existing endpoints causes the following error and state the error here?

struct snd_soc_dai *codec_dai;
struct sdw_slave *slave;
struct device *sdw_dev;
const char *sdw_codec_name;
int ret, i;

dlc = kzalloc(sizeof(*dlc), GFP_KERNEL);
if (!dlc)
return -ENOMEM;

adr_end = &adr_dev->endpoints[end_index];
dai_info = &codec_info->dais[adr_end->num];

dlc->dai_name = dai_info->dai_name;
codec_dai = snd_soc_find_dai_with_mutex(dlc);
if (!codec_dai) {
dev_warn(dev, "codec dai %s not registered yet\n", dlc->dai_name);
kfree(dlc);
return -EPROBE_DEFER;
}
kfree(dlc);

sdw_codec_name = _asoc_sdw_get_codec_name(dev, adr_link, adr_index);
if (!sdw_codec_name)
return -ENOMEM;
Expand Down
Loading