Unverified Commit 9af73c31 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF/Intel: fix cppcheck warnings" from Pierre-Louis... 

Merge series "ASoC: SOF/Intel: fix cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

A small set of fixes to reduce the number of warnings.

Pierre-Louis Bossart (5):
  ASOC: SOF: Intel: hda-codec: move unused label to correct position
  ASoC: SOF: Intel: hda-codec: move variable used conditionally
  ASoC: Intel: rename shadowed variable for all broadwell boards
  ASoC: Intel: bytcht_cx2072x: simplify return handling
  ASoC: Intel: sof_sdw: clarify operator precedence

 sound/soc/intel/boards/bdw-rt5650.c     | 10 +++++-----
 sound/soc/intel/boards/bdw-rt5677.c     |  8 ++++----
 sound/soc/intel/boards/broadwell.c      |  8 ++++----
 sound/soc/intel/boards/bytcht_cx2072x.c |  2 +-
 sound/soc/intel/boards/sof_sdw.c        |  2 +-
 sound/soc/sof/intel/hda-codec.c         |  7 ++++++-
 6 files changed, 21 insertions(+), 16 deletions(-)

--
2.25.1
parents da9afe50 9c7deb05

sound/soc/intel/boards/bdw-rt5650.c

+5 −5
Original line number Diff line number Diff line
@@ -88,13 +88,13 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, 
{

	struct snd_interval *rate = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

	struct snd_interval *chan = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_CHANNELS);



	/* The ADSP will covert the FE rate to 48k, max 4-channels */

	rate->min = rate->max = 48000;

	channels->min = 2;

	channels->max = 4;

	chan->min = 2;

	chan->max = 4;



	/* set SSP0 to 24 bit */

	snd_mask_set_format(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),

sound/soc/intel/boards/bdw-rt5677.c

+4 −4
Original line number Diff line number Diff line
@@ -141,12 +141,12 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, 
{

	struct snd_interval *rate = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

	struct snd_interval *chan = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_CHANNELS);



	/* The ADSP will covert the FE rate to 48k, stereo */

	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;

	chan->min = chan->max = 2;



	/* set SSP0 to 16 bit */

	params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);

sound/soc/intel/boards/broadwell.c

+4 −4
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, 
{

	struct snd_interval *rate = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params,

	struct snd_interval *chan = hw_param_interval(params,

						      SNDRV_PCM_HW_PARAM_CHANNELS);



	/* The ADSP will covert the FE rate to 48k, stereo */

	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;

	chan->min = chan->max = 2;



	/* set SSP0 to 16 bit */

	params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);

sound/soc/intel/boards/bytcht_cx2072x.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int byt_cht_cx2072x_init(struct snd_soc_pcm_runtime *rtd) 


	snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), 50);



	return ret;

	return 0;

}



static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd,

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

+6 −1
Original line number Diff line number Diff line
@@ -116,10 +116,10 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
{

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	struct hdac_hda_priv *hda_priv;

	struct hda_codec *codec;

#endif

	struct hda_bus *hbus = sof_to_hbus(sdev);

	struct hdac_device *hdev;

	struct hda_codec *codec;

	u32 hda_cmd = (address << 28) | (AC_NODE_ROOT << 20) |

		(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;

	u32 resp = -1;
@@ -178,6 +178,11 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address, 
	}



	return ret;



error:

	snd_hdac_ext_bus_device_exit(hdev);

	return -ENOENT;



#else

	hdev = devm_kzalloc(sdev->dev, sizeof(*hdev), GFP_KERNEL);

	if (!hdev)