korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 15:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: hdac_hda: improve error logs

Browse Source 
We have a couple of duplicate logs and missing information, add
__func__ consistently and make sure useful error codes are logged.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://msgid.link/r/20240325221925.206507-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2024-03-25 17:19:25 -05:00 committed by Mark Brown
parent 6a92834166
commit ea5fee227f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sound/soc/codecs/hdac_hda.c
View File

@ -230,7 +230,8 @@ static int hdac_hda_dai_hw_params(struct snd_pcm_substream *substream,
format_val = snd_hdac_stream_format(params_channels(params), bits, params_rate(params)); format_val = snd_hdac_stream_format(params_channels(params), bits, params_rate(params));
if (!format_val) { if (!format_val) {
dev_err(dai->dev, dev_err(dai->dev,
"invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n", "%s: invalid format_val, rate=%d, ch=%d, format=%d, maxbps=%d\n",
__func__,
params_rate(params), params_channels(params), params_rate(params), params_channels(params),
params_format(params), maxbps); params_format(params), maxbps);
@ -266,14 +267,12 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct hda_pcm_stream *hda_stream; struct hda_pcm_stream *hda_stream;
struct hdac_hda_priv *hda_pvt; struct hdac_hda_priv *hda_pvt;
struct hdac_device *hdev;
unsigned int format_val; unsigned int format_val;
struct hda_pcm *pcm; struct hda_pcm *pcm;
unsigned int stream; unsigned int stream;
int ret = 0; int ret = 0;
hda_pvt = snd_soc_component_get_drvdata(component); hda_pvt = snd_soc_component_get_drvdata(component);
hdev = &hda_pvt->codec->core;
pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai);
if (!pcm) if (!pcm)
return -EINVAL; return -EINVAL;
@ -286,7 +285,7 @@ static int hdac_hda_dai_prepare(struct snd_pcm_substream *substream,
ret = snd_hda_codec_prepare(hda_pvt->codec, hda_stream, ret = snd_hda_codec_prepare(hda_pvt->codec, hda_stream,
stream, format_val, substream); stream, format_val, substream);
if (ret < 0) if (ret < 0)
dev_err(&hdev->dev, "codec prepare failed %d\n", ret); dev_err(dai->dev, "%s: failed %d\n", __func__, ret);
return ret; return ret;
} }
@ -298,6 +297,7 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream,
struct hdac_hda_priv *hda_pvt; struct hdac_hda_priv *hda_pvt;
struct hda_pcm_stream *hda_stream; struct hda_pcm_stream *hda_stream;
struct hda_pcm *pcm; struct hda_pcm *pcm;
int ret;
hda_pvt = snd_soc_component_get_drvdata(component); hda_pvt = snd_soc_component_get_drvdata(component);
pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai); pcm = snd_soc_find_pcm_from_dai(hda_pvt, dai);
@ -308,7 +308,11 @@ static int hdac_hda_dai_open(struct snd_pcm_substream *substream,
hda_stream = &pcm->stream[substream->stream]; hda_stream = &pcm->stream[substream->stream];
return hda_stream->ops.open(hda_stream, hda_pvt->codec, substream); ret = hda_stream->ops.open(hda_stream, hda_pvt->codec, substream);
if (ret < 0)
dev_err(dai->dev, "%s: failed %d\n", __func__, ret);
return ret;
} }
static void hdac_hda_dai_close(struct snd_pcm_substream *substream, static void hdac_hda_dai_close(struct snd_pcm_substream *substream,
@ -367,7 +371,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt,
pcm_name = "HDMI 3"; pcm_name = "HDMI 3";
break; break;
default: default:
dev_err(&hcodec->core.dev, "invalid dai id %d\n", dai->id); dev_err(dai->dev, "%s: invalid dai id %d\n", __func__, dai->id);
return NULL; return NULL;
} }
@ -381,7 +385,7 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt,
} }
} }
dev_err(&hcodec->core.dev, "didn't find PCM for DAI %s\n", dai->name); dev_err(dai->dev, "%s: didn't find PCM for DAI %s\n", __func__, dai->name);
return NULL; return NULL;
} }
@ -411,7 +415,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev));
if (!hlink) { if (!hlink) {
dev_err(&hdev->dev, "hdac link not found\n"); dev_err(&hdev->dev, "%s: hdac link not found\n", __func__);
return -EIO; return -EIO;
} }
@ -429,7 +433,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
ret = snd_hda_codec_device_new(hcodec->bus, component->card->snd_card, ret = snd_hda_codec_device_new(hcodec->bus, component->card->snd_card,
hdev->addr, hcodec, true); hdev->addr, hcodec, true);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "failed to create hda codec %d\n", ret); dev_err(&hdev->dev, "%s: failed to create hda codec %d\n", __func__, ret);
goto error_no_pm; goto error_no_pm;
} }
@ -446,7 +450,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
if (fw) { if (fw) {
ret = snd_hda_load_patch(hcodec->bus, fw->size, fw->data); ret = snd_hda_load_patch(hcodec->bus, fw->size, fw->data);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "failed to load hda patch %d\n", ret); dev_err(&hdev->dev, "%s: failed to load hda patch %d\n", __func__, ret);
goto error_no_pm; goto error_no_pm;
} }
release_firmware(fw); release_firmware(fw);
@ -470,13 +474,13 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name); ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "name failed %s\n", hcodec->preset->name); dev_err(&hdev->dev, "%s: name failed %s\n", __func__, hcodec->preset->name);
goto error_pm; goto error_pm;
} }
ret = snd_hdac_regmap_init(&hcodec->core); ret = snd_hdac_regmap_init(&hcodec->core);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "regmap init failed\n"); dev_err(&hdev->dev, "%s: regmap init failed\n", __func__);
goto error_pm; goto error_pm;
} }
@ -484,16 +488,16 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
if (patch) { if (patch) {
ret = patch(hcodec); ret = patch(hcodec);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "patch failed %d\n", ret); dev_err(&hdev->dev, "%s: patch failed %d\n", __func__, ret);
goto error_regmap; goto error_regmap;
} }
} else { } else {
dev_dbg(&hdev->dev, "no patch file found\n"); dev_dbg(&hdev->dev, "%s: no patch file found\n", __func__);
} }
ret = snd_hda_codec_parse_pcms(hcodec); ret = snd_hda_codec_parse_pcms(hcodec);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret); dev_err(&hdev->dev, "%s: unable to map pcms to dai %d\n", __func__, ret);
goto error_patch; goto error_patch;
} }
@ -501,8 +505,8 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component)
if (!is_hdmi_codec(hcodec)) { if (!is_hdmi_codec(hcodec)) {
ret = snd_hda_codec_build_controls(hcodec); ret = snd_hda_codec_build_controls(hcodec);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "unable to create controls %d\n", dev_err(&hdev->dev, "%s: unable to create controls %d\n",
ret); __func__, ret);
goto error_patch; goto error_patch;
} }
} }
@ -548,7 +552,7 @@ static void hdac_hda_codec_remove(struct snd_soc_component *component)
hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev));
if (!hlink) { if (!hlink) {
dev_err(&hdev->dev, "hdac link not found\n"); dev_err(&hdev->dev, "%s: hdac link not found\n", __func__);
return; return;
} }
@ -624,7 +628,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev)
/* hold the ref while we probe */ /* hold the ref while we probe */
hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev));
if (!hlink) { if (!hlink) {
dev_err(&hdev->dev, "hdac link not found\n"); dev_err(&hdev->dev, "%s: hdac link not found\n", __func__);
return -EIO; return -EIO;
} }
snd_hdac_ext_bus_link_get(hdev->bus, hlink); snd_hdac_ext_bus_link_get(hdev->bus, hlink);
@ -640,7 +644,7 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev)
ARRAY_SIZE(hdac_hda_dais)); ARRAY_SIZE(hdac_hda_dais));
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "failed to register HDA codec %d\n", ret); dev_err(&hdev->dev, "%s: failed to register HDA codec %d\n", __func__, ret);
return ret; return ret;
} }