diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-10 21:10:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-10 21:10:02 +0100 |
| commit | 4fc320da5dc6d9d650e9c80b6141299606035cf1 (patch) | |
| tree | 48871774740bef8c6021910586b4ba32382ce980 /sound/soc/sof/intel/hda-trace.c | |
| parent | Merge series "ASoC: SOF/Intel/SoundWire: add missing quirks and DMIC support"... (diff) | |
| parent | ASoC: SOF: ext_manifest: use explicit number for elem_type (diff) | |
| download | linux-4fc320da5dc6d9d650e9c80b6141299606035cf1.tar.xz linux-4fc320da5dc6d9d650e9c80b6141299606035cf1.zip | |
Merge series "ASoC: SOF: cleanups" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Minor cleanups for error formats, missing cases, useless functions and
simplifications.
Curtis Malainey (2):
ASoC: SOF: add missing pm debug
ASoC: SOF: fix string format for errors
Fred Oh (1):
ASoC: SOF: ext_manifest: use explicit number for elem_type
Guennadi Liakhovetski (2):
ASoC: SOF: remove unused functions
ASoC: SOF: HDA: (cosmetic) simplify hda_dsp_d0i3_work()
include/sound/sof/ext_manifest.h | 6 ++--
sound/soc/sof/intel/hda-compress.c | 2 +-
sound/soc/sof/intel/hda-dsp.c | 18 +++++------
sound/soc/sof/intel/hda-loader.c | 6 ++--
sound/soc/sof/intel/hda-pcm.c | 2 +-
sound/soc/sof/intel/hda-trace.c | 4 +--
sound/soc/sof/intel/hda.c | 50 ------------------------------
sound/soc/sof/intel/hda.h | 1 -
sound/soc/sof/ipc.c | 2 ++
9 files changed, 19 insertions(+), 72 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/sof/intel/hda-trace.c')
| -rw-r--r-- | sound/soc/sof/intel/hda-trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/hda-trace.c b/sound/soc/sof/intel/hda-trace.c index 81d76d3debc6..29e3da3c63db 100644 --- a/sound/soc/sof/intel/hda-trace.c +++ b/sound/soc/sof/intel/hda-trace.c @@ -32,7 +32,7 @@ static int hda_dsp_trace_prepare(struct snd_sof_dev *sdev) ret = hda_dsp_stream_hw_params(sdev, stream, dmab, NULL); if (ret < 0) - dev_err(sdev->dev, "error: hdac prepare failed: %x\n", ret); + dev_err(sdev->dev, "error: hdac prepare failed: %d\n", ret); return ret; } @@ -59,7 +59,7 @@ int hda_dsp_trace_init(struct snd_sof_dev *sdev, u32 *stream_tag) */ ret = hda_dsp_trace_prepare(sdev); if (ret < 0) { - dev_err(sdev->dev, "error: hdac trace init failed: %x\n", ret); + dev_err(sdev->dev, "error: hdac trace init failed: %d\n", ret); hda_dsp_stream_put(sdev, SNDRV_PCM_STREAM_CAPTURE, *stream_tag); hda->dtrace_stream = NULL; *stream_tag = 0; |