Unverified Commit 3c9432d1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: trivial code cleanups" from Pierre-Louis Bossart... 

Merge series "ASoC: SOF: trivial code cleanups" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Fix warnings reported by tools - no functionality change.

Payal Kshirsagar (2):
  ASoC: SOF: remove unneeded variables
  ASoC: SOF: Intel: hda: remove unnecessary parentheses

 sound/soc/sof/intel/hda-codec.c | 5 +----
 sound/soc/sof/intel/hda-dsp.c   | 8 ++++----
 sound/soc/sof/nocodec.c         | 6 ++----
 3 files changed, 7 insertions(+), 12 deletions(-)

base-commit: dd8e871d
--
2.20.1
parents 41d5d7b3 805a23de

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

+1 −4
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ EXPORT_SYMBOL_NS(hda_codec_i915_init, SND_SOC_SOF_HDA_AUDIO_CODEC_I915); 
int hda_codec_i915_exit(struct snd_sof_dev *sdev)

{

	struct hdac_bus *bus = sof_to_bus(sdev);

	int ret;



	if (!bus->audio_component)

		return 0;
@@ -215,9 +214,7 @@ int hda_codec_i915_exit(struct snd_sof_dev *sdev) 
	/* power down unconditionally */

	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false);



	ret = snd_hdac_i915_exit(bus);



	return ret;

	return snd_hdac_i915_exit(bus);

}

EXPORT_SYMBOL_NS(hda_codec_i915_exit, SND_SOC_SOF_HDA_AUDIO_CODEC_I915);

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

+4 −4
Original line number Diff line number Diff line
@@ -226,10 +226,10 @@ bool hda_dsp_core_is_enabled(struct snd_sof_dev *sdev, 


	val = snd_sof_dsp_read(sdev, HDA_DSP_BAR, HDA_DSP_REG_ADSPCS);



	is_enable = ((val & HDA_DSP_ADSPCS_CPA_MASK(core_mask)) &&

	is_enable = (val & HDA_DSP_ADSPCS_CPA_MASK(core_mask)) &&

		    (val & HDA_DSP_ADSPCS_SPA_MASK(core_mask)) &&

		    !(val & HDA_DSP_ADSPCS_CRST_MASK(core_mask)) &&

			!(val & HDA_DSP_ADSPCS_CSTALL_MASK(core_mask)));

		    !(val & HDA_DSP_ADSPCS_CSTALL_MASK(core_mask));



	dev_dbg(sdev->dev, "DSP core(s) enabled? %d : core_mask %x\n",

		is_enable, core_mask);

sound/soc/sof/nocodec.c

+2 −4
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ int sof_nocodec_setup(struct device *dev, 
		      const struct snd_sof_dsp_ops *ops)

{

	struct snd_soc_dai_link *links;

	int ret;



	/* create dummy BE dai_links */

	links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) *
@@ -74,9 +73,8 @@ int sof_nocodec_setup(struct device *dev, 
	if (!links)

		return -ENOMEM;



	ret = sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,

	return sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,

				     &sof_nocodec_card);

	return ret;

}

EXPORT_SYMBOL(sof_nocodec_setup);

CRA Git | Maintained and supported by SUSTech CRA and CCSE