Unverified Commit 9c0da293 authored Apr 01, 2021 by Mark Brown

Merge series "ASoC: remove cppcheck warnings for multiple SOCs" from...

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

Trivial cleanups to make cppcheck less verbose.

There should be no functionality change, except for the 'sti_uniperif'
patch where an error check was added.

Pierre-Louis Bossart (17):
  ASoC: amd: renoir: acp3x-pdm-dma: remove unnecessary assignments
  ASoC: atmel: fix shadowed variable
  ASoC: atmel: atmel-i2s: remove useless initialization
  ASoC: bcm: cygnus_ssp: remove useless initialization
  ASoC: meson: axg-tdmin: remove useless assignment
  ASoC: meson: axg-tdmout: remove useless assignment
  ASoC: pxa: remove useless assignment
  ASoC: sti: sti_uniperif: add missing error check
  ASoC: sti: uniperif: align function prototypes
  ASoC: stm: stm32_adfsdm: fix snprintf format string
  ASoC: sunxi: sun8i-codec: clarify expression
  ASoC: tegra: tegra20_das: clarify expression
  ASoC: tegra: tegra20_das: align function prototypes
  ASoC: ti: omap-abe-twl6040: remove useless assignment
  ASoC: ti: omap-mcsp: remove duplicate test
  ASoC: ux500: mop500: rename shadowing variable
  ASoC: ux500: mop500: align function prototype

 sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 --
 sound/soc/atmel/atmel-classd.c       | 6 +++---
 sound/soc/atmel/atmel-i2s.c          | 2 +-
 sound/soc/bcm/cygnus-ssp.c           | 2 +-
 sound/soc/meson/axg-tdmin.c          | 2 +-
 sound/soc/meson/axg-tdmout.c         | 2 +-
 sound/soc/pxa/mmp-pcm.c              | 2 +-
 sound/soc/sti/sti_uniperif.c         | 2 ++
 sound/soc/sti/uniperif.h             | 4 ++--
 sound/soc/stm/stm32_adfsdm.c         | 2 +-
 sound/soc/sunxi/sun8i-codec.c        | 2 +-
 sound/soc/tegra/tegra20_das.c        | 8 ++++----
 sound/soc/tegra/tegra20_das.h        | 6 +++---
 sound/soc/ti/omap-abe-twl6040.c      | 2 +-
 sound/soc/ti/omap-mcbsp.c            | 3 +--
 sound/soc/ux500/mop500.c             | 6 +++---
 sound/soc/ux500/mop500_ab8500.h      | 2 +-
 17 files changed, 27 insertions(+), 28 deletions(-)

--
2.25.1

parents bb0f78e5 b4d09a01

sound/soc/amd/renoir/acp3x-pdm-dma.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,6 @@ static int start_pdm_dma(void __iomem *acp_base)
	enable_pdm_clock(acp_base);		enable_pdm_clock(acp_base);
	rn_writel(pdm_enable, acp_base + ACP_WOV_PDM_ENABLE);		rn_writel(pdm_enable, acp_base + ACP_WOV_PDM_ENABLE);
	rn_writel(pdm_dma_enable, acp_base + ACP_WOV_PDM_DMA_ENABLE);		rn_writel(pdm_dma_enable, acp_base + ACP_WOV_PDM_DMA_ENABLE);
	pdm_dma_enable = 0x00;
	timeout = 0;		timeout = 0;
	while (++timeout < ACP_COUNTER) {		while (++timeout < ACP_COUNTER) {
	pdm_dma_enable = rn_readl(acp_base + ACP_WOV_PDM_DMA_ENABLE);		pdm_dma_enable = rn_readl(acp_base + ACP_WOV_PDM_DMA_ENABLE);
	@@ -153,7 +152,6 @@ static int stop_pdm_dma(void __iomem *acp_base)
	if (pdm_dma_enable & 0x01) {		if (pdm_dma_enable & 0x01) {
	pdm_dma_enable = 0x02;		pdm_dma_enable = 0x02;
	rn_writel(pdm_dma_enable, acp_base + ACP_WOV_PDM_DMA_ENABLE);		rn_writel(pdm_dma_enable, acp_base + ACP_WOV_PDM_DMA_ENABLE);
	pdm_dma_enable = 0x00;
	timeout = 0;		timeout = 0;
	while (++timeout < ACP_COUNTER) {		while (++timeout < ACP_COUNTER) {
	pdm_dma_enable = rn_readl(acp_base +		pdm_dma_enable = rn_readl(acp_base +

sound/soc/atmel/atmel-classd.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,7 @@ static struct atmel_classd_pdata atmel_classd_dt_init(struct device dev)
	{		{
	struct device_node *np = dev->of_node;		struct device_node *np = dev->of_node;
	struct atmel_classd_pdata *pdata;		struct atmel_classd_pdata *pdata;
	const char *pwm_type;		const char *pwm_type_s;
	int ret;		int ret;

	if (!np) {		if (!np) {
	@@ -60,8 +60,8 @@ static struct atmel_classd_pdata atmel_classd_dt_init(struct device dev)
	if (!pdata)		if (!pdata)
	return ERR_PTR(-ENOMEM);		return ERR_PTR(-ENOMEM);

	ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type);		ret = of_property_read_string(np, "atmel,pwm-type", &pwm_type_s);
	if ((ret == 0) && (strcmp(pwm_type, "diff") == 0))		if ((ret == 0) && (strcmp(pwm_type_s, "diff") == 0))
	pdata->pwm_type = CLASSD_MR_PWMTYP_DIFF;		pdata->pwm_type = CLASSD_MR_PWMTYP_DIFF;
	else		else
	pdata->pwm_type = CLASSD_MR_PWMTYP_SINGLE;		pdata->pwm_type = CLASSD_MR_PWMTYP_SINGLE;

sound/soc/atmel/atmel-i2s.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -595,7 +595,7 @@ static int atmel_i2s_probe(struct platform_device *pdev)
	struct regmap *regmap;		struct regmap *regmap;
	void __iomem *base;		void __iomem *base;
	int irq;		int irq;
	int err = -ENXIO;		int err;
	unsigned int pcm_flags = 0;		unsigned int pcm_flags = 0;
	unsigned int version;		unsigned int version;

sound/soc/bcm/cygnus-ssp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1310,7 +1310,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
	struct device_node *child_node;		struct device_node *child_node;
	struct resource *res;		struct resource *res;
	struct cygnus_audio *cygaud;		struct cygnus_audio *cygaud;
	int err = -EINVAL;		int err;
	int node_count;		int node_count;
	int active_port_count;		int active_port_count;

sound/soc/meson/axg-tdmin.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ static const struct snd_kcontrol_new axg_tdmin_in_mux =
	static struct snd_soc_dai *		static struct snd_soc_dai *
	axg_tdmin_get_be(struct snd_soc_dapm_widget *w)		axg_tdmin_get_be(struct snd_soc_dapm_widget *w)
	{		{
	struct snd_soc_dapm_path *p = NULL;		struct snd_soc_dapm_path *p;
	struct snd_soc_dai *be;		struct snd_soc_dai *be;

	snd_soc_dapm_widget_for_each_source_path(w, p) {		snd_soc_dapm_widget_for_each_source_path(w, p) {