Unverified Commit 87143bfd authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: remove more cppcheck warnings" from Pierre-Louis Bossart... 

Merge series "ASoC: remove more cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

I missed those warnings in the previous rounds, they are mostly
trivial and shouldn't change the behavior.

Pierre-Louis Bossart (5):
  ASoC: soc-acpi: remove useless initialization
  ASoC: soc-core: fix signed/unsigned issue
  ASoC: soc-core: fix always-false condition
  ASoC: codecs: lpass-rx-macro: remove useless return
  ASoC: codecs: rt5682: clarify expression

 sound/soc/codecs/lpass-rx-macro.c | 2 --
 sound/soc/codecs/rt5682.c         | 2 +-
 sound/soc/soc-acpi.c              | 2 +-
 sound/soc/soc-core.c              | 7 +------
 4 files changed, 3 insertions(+), 10 deletions(-)

--
2.25.1
parents e86a53fb 9726db36

sound/soc/codecs/lpass-rx-macro.c

+0 −2
Original line number Diff line number Diff line
@@ -1620,8 +1620,6 @@ static int rx_macro_set_interpolator_rate(struct snd_soc_dai *dai, 
		return ret;



	ret = rx_macro_set_mix_interpolator_rate(dai, rate_val, sample_rate);

	if (ret)

		return ret;



	return ret;

}

sound/soc/codecs/rt5682.c

+1 −1
Original line number Diff line number Diff line
@@ -2401,7 +2401,7 @@ static int rt5682_set_component_pll(struct snd_soc_component *component, 
			(pll_code.n_code << RT5682_PLL_N_SFT) | pll_code.k_code);

		snd_soc_component_write(component, RT5682_PLL_CTRL_2,

			((pll_code.m_bp ? 0 : pll_code.m_code) << RT5682_PLL_M_SFT) |

			(pll_code.m_bp << RT5682_PLL_M_BP_SFT | RT5682_PLL_RST));

			((pll_code.m_bp << RT5682_PLL_M_BP_SFT) | RT5682_PLL_RST));

	}



	rt5682->pll_in[pll_id] = freq_in;

sound/soc/soc-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static acpi_status snd_soc_acpi_find_package(acpi_handle handle, u32 level, 
					     void *context, void **ret)

{

	struct acpi_device *adev;

	acpi_status status = AE_OK;

	acpi_status status;

	struct snd_soc_acpi_package_context *pkg_ctx = context;



	pkg_ctx->data_valid = false;

sound/soc/soc-core.c

+1 −6
Original line number Diff line number Diff line
@@ -2219,7 +2219,7 @@ static char *fmt_single_name(struct device *dev, int *id) 
{

	const char *devname = dev_name(dev);

	char *found, *name;

	int id1, id2;

	unsigned int id1, id2;



	if (devname == NULL)

		return NULL;
@@ -2785,11 +2785,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, 
		return -EINVAL;

	}

	num_routes /= 2;

	if (!num_routes) {

		dev_err(card->dev, "ASoC: Property '%s's length is zero\n",

			propname);

		return -EINVAL;

	}



	routes = devm_kcalloc(card->dev, num_routes, sizeof(*routes),

			      GFP_KERNEL);