]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: SOF: fix string format for errors
authorCurtis Malainey <cujomalainey@chromium.org>
Mon, 8 Feb 2021 23:21:46 +0000 (17:21 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 10 Feb 2021 17:17:11 +0000 (17:17 +0000)
These are negative error return values, printing them as hex is annoying
and not beneficial. Switch back to signed type to make error lookup
simpler.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210208232149.58899-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-compress.c
sound/soc/sof/intel/hda-dsp.c
sound/soc/sof/intel/hda-loader.c
sound/soc/sof/intel/hda-pcm.c
sound/soc/sof/intel/hda-trace.c

index c6cf7b31393422e2fd07e7c267d70b4452d6699e..fe2f3f7d236b10373248ce089a6936d941f79037 100644 (file)
@@ -82,7 +82,7 @@ int hda_probe_compr_set_params(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;
        }
 
index e92e9750b720fd5657b7369eb99515efee5381f8..72c0b8e9a1969492dc77751d6ddb1013f135944d 100644 (file)
@@ -732,7 +732,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev)
                                ret = snd_hdac_ext_bus_link_power_up(hlink);
                                if (ret < 0) {
                                        dev_dbg(sdev->dev,
-                                               "error %x in %s: failed to power up links",
+                                               "error %d in %s: failed to power up links",
                                                ret, __func__);
                                        return ret;
                                }
index d744952f695436d936a4cd06a525ba74d2422fd0..fc25ee8f68dcb6497cbf3bd5445a482121d72dc8 100644 (file)
@@ -47,7 +47,7 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig
        /* allocate DMA buffer */
        ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV_SG, &pci->dev, size, dmab);
        if (ret < 0) {
-               dev_err(sdev->dev, "error: memory alloc failed: %x\n", ret);
+               dev_err(sdev->dev, "error: memory alloc failed: %d\n", ret);
                goto error;
        }
 
@@ -58,13 +58,13 @@ static struct hdac_ext_stream *cl_stream_prepare(struct snd_sof_dev *sdev, unsig
        if (direction == SNDRV_PCM_STREAM_CAPTURE) {
                ret = hda_dsp_iccmax_stream_hw_params(sdev, dsp_stream, dmab, NULL);
                if (ret < 0) {
-                       dev_err(sdev->dev, "error: iccmax stream prepare failed: %x\n", ret);
+                       dev_err(sdev->dev, "error: iccmax stream prepare failed: %d\n", ret);
                        goto error;
                }
        } else {
                ret = hda_dsp_stream_hw_params(sdev, dsp_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);
                        goto error;
                }
                hda_dsp_stream_spib_config(sdev, dsp_stream, HDA_DSP_SPIB_ENABLE, size);
index 689934131a682602c96c30e81a89fc462e2b17a4..df00db8369c78809c509e6d32e703335b828ed1b 100644 (file)
@@ -111,7 +111,7 @@ int hda_dsp_pcm_hw_params(struct snd_sof_dev *sdev,
 
        ret = hda_dsp_stream_hw_params(sdev, stream, dmab, params);
        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;
        }
 
index 81d76d3debc65bb9ca5d93c9b3e0a2cdb3e47577..29e3da3c63db01ff6b3e948b1154fd531979e9b0 100644 (file)
@@ -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;