Unverified Commit bdb94f00 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF/Intel: remove __func__ from dev_dbg() 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Cleanups suggested by Greg KH during SoundWire reviews, since the
__func__ information can be added with the dyndbg kernel parameter
[1].

The first two patches change the error level in cases where the use of
dev_dbg() was inconsistent with an aborted programming sequence.

[1] https://lore.kernel.org/alsa-devel/20220610023537.27223-2-yung-chuan.liao@linux.intel.com/
parents 7adadfb0 d2d19cb6

sound/soc/intel/boards/hda_dsp_common.c

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ int hda_dsp_hdmi_build_controls(struct snd_soc_card *card, 
			hpcm->pcm = spcm;

			hpcm->device = spcm->device;

			dev_dbg(card->dev,

				"%s: mapping HDMI converter %d to PCM %d (%p)\n",

				__func__, i, hpcm->device, spcm);

				"mapping HDMI converter %d to PCM %d (%p)\n",

				i, hpcm->device, spcm);

		} else {

			hpcm->pcm = NULL;

			hpcm->device = SNDRV_PCM_INVALID_DEVICE;

sound/soc/intel/boards/skl_hda_dsp_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link) 
	struct skl_hda_private *ctx = snd_soc_card_get_drvdata(card);

	int ret = 0;



	dev_dbg(card->dev, "%s: dai link name - %s\n", __func__, link->name);

	dev_dbg(card->dev, "dai link name - %s\n", link->name);

	link->platforms->name = ctx->platform_name;

	link->nonatomic = 1;
@@ -203,7 +203,7 @@ static int skl_hda_audio_probe(struct platform_device *pdev) 
	struct skl_hda_private *ctx;

	int ret;



	dev_dbg(&pdev->dev, "%s: entry\n", __func__);

	dev_dbg(&pdev->dev, "entry\n");



	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

sound/soc/intel/boards/sof_sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ static int mc_probe(struct platform_device *pdev) 
	int amp_num = 0, i;

	int ret;



	dev_dbg(&pdev->dev, "Entry %s\n", __func__);

	dev_dbg(&pdev->dev, "Entry\n");



	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

sound/soc/sof/intel/hda-dai.c

+3 −3
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_soc_d 
	if (hext_stream && hext_stream->link_prepared)

		return 0;



	dev_dbg(sdev->dev, "%s: prepare stream dir %d\n", __func__, substream->stream);

	dev_dbg(sdev->dev, "prepare stream dir %d\n", substream->stream);



	ret = hda_link_dma_prepare(substream);

	if (ret < 0)
@@ -419,7 +419,7 @@ static int ipc3_hda_dai_trigger(struct snd_pcm_substream *substream, 
	struct snd_soc_dapm_widget *w;

	int ret;



	dev_dbg(dai->dev, "%s: cmd=%d dai %s direction %d\n", __func__, cmd,

	dev_dbg(dai->dev, "cmd=%d dai %s direction %d\n", cmd,

		dai->name, substream->stream);



	ret = hda_link_dma_trigger(substream, cmd);
@@ -468,7 +468,7 @@ static int ipc4_hda_dai_trigger(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *cpu_dai;

	int ret;



	dev_dbg(dai->dev, "%s: cmd=%d dai %s direction %d\n", __func__, cmd,

	dev_dbg(dai->dev, "cmd=%d dai %s direction %d\n", cmd,

		dai->name, substream->stream);



	hstream = substream->runtime->private_data;

sound/soc/sof/intel/hda-dsp.c

+2 −2
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) 
			if (hlink->ref_count) {

				ret = snd_hdac_ext_bus_link_power_up(hlink);

				if (ret < 0) {

					dev_dbg(sdev->dev,

					dev_err(sdev->dev,

						"error %d in %s: failed to power up links",

						ret, __func__);

					return ret;
@@ -871,7 +871,7 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) 
		/* no link can be powered in s0ix state */

		ret = snd_hdac_ext_bus_link_power_down_all(bus);

		if (ret < 0) {

			dev_dbg(sdev->dev,

			dev_err(sdev->dev,

				"error %d in %s: failed to power down links",

				ret, __func__);

			return ret;