summaryrefslogtreecommitdiffstats
path: root/sound/soc/amd
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-07-23 23:33:05 +0100
committerMark Brown <broonie@kernel.org>2023-07-23 23:33:05 +0100
commitde1b43a57aff8b1808bbfe0402932f9e373d1172 (patch)
tree699c828946223aab18a0aab5175e6902a8ce2e42 /sound/soc/amd
parent8cf2e3b1961e59dabc75e9e917d58439164a8f84 (diff)
parent6eaae198076080886b9e7d57f4ae06fa782f90ef (diff)
downloadlinux-stable-de1b43a57aff8b1808bbfe0402932f9e373d1172.tar.gz
linux-stable-de1b43a57aff8b1808bbfe0402932f9e373d1172.tar.bz2
linux-stable-de1b43a57aff8b1808bbfe0402932f9e373d1172.zip
ASoC: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'sound/soc/amd')
-rw-r--r--sound/soc/amd/ps/pci-ps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
index 5b46dc8573f8..4af3c3665387 100644
--- a/sound/soc/amd/ps/pci-ps.c
+++ b/sound/soc/amd/ps/pci-ps.c
@@ -257,7 +257,7 @@ static int sdw_amd_scan_controller(struct device *dev)
&sdw_manager_bitmap, 1);
if (ret) {
- dev_err(dev, "Failed to read mipi-sdw-manager-list: %d\n", ret);
+ dev_dbg(dev, "Failed to read mipi-sdw-manager-list: %d\n", ret);
return -EINVAL;
}
count = hweight32(sdw_manager_bitmap);
@@ -641,7 +641,7 @@ static int snd_acp63_probe(struct pci_dev *pci,
ret = get_acp63_device_config(val, pci, adata);
/* ACP PCI driver probe should be continued even PDM or SoundWire Devices are not found */
if (ret) {
- dev_err(&pci->dev, "get acp device config failed:%d\n", ret);
+ dev_dbg(&pci->dev, "get acp device config failed:%d\n", ret);
goto skip_pdev_creation;
}
ret = create_acp63_platform_devs(pci, adata, addr);