| From dc1008eb36c121cec7621c9bd4e984e9ac3e6115 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 Aug 2020 00:24:20 +0530 |
| Subject: ASoC: AMD: Clean kernel log from deferred probe error messages |
| |
| From: Akshu Agrawal <akshu.agrawal@amd.com> |
| |
| [ Upstream commit f7660445c8e7fda91e8b944128554249d886b1d4 ] |
| |
| While the driver waits for DAIs to be probed and retries probing, |
| have the error messages at debug level instead of error. |
| |
| Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com> |
| Link: https://lore.kernel.org/r/20200826185454.5545-1-akshu.agrawal@amd.com |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/amd/acp3x-rt5682-max9836.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c |
| index 406526e79af34..1a4e8ca0f99c2 100644 |
| --- a/sound/soc/amd/acp3x-rt5682-max9836.c |
| +++ b/sound/soc/amd/acp3x-rt5682-max9836.c |
| @@ -472,12 +472,17 @@ static int acp3x_probe(struct platform_device *pdev) |
| |
| ret = devm_snd_soc_register_card(&pdev->dev, card); |
| if (ret) { |
| - dev_err(&pdev->dev, |
| + if (ret != -EPROBE_DEFER) |
| + dev_err(&pdev->dev, |
| "devm_snd_soc_register_card(%s) failed: %d\n", |
| card->name, ret); |
| - return ret; |
| + else |
| + dev_dbg(&pdev->dev, |
| + "devm_snd_soc_register_card(%s) probe deferred: %d\n", |
| + card->name, ret); |
| } |
| - return 0; |
| + |
| + return ret; |
| } |
| |
| static const struct acpi_device_id acp3x_audio_acpi_match[] = { |
| -- |
| 2.27.0 |
| |
