diff options
| author | Mark Brown <broonie@kernel.org> | 2021-03-02 02:31:55 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-03-10 16:08:35 +0300 |
| commit | fa576ff64f5d4d67848051ee3f7340519098a98a (patch) | |
| tree | e5d9acce3087cb5468022f3b22b992462b2d46ee /sound/soc/sh/rcar/cmd.c | |
| parent | ef1ed5b855f605af0f659015c5fd6a98cfcb6964 (diff) | |
| parent | b6e499bcb32f07364cf62e7022032f1c0632f76c (diff) | |
| download | linux-fa576ff64f5d4d67848051ee3f7340519098a98a.tar.xz | |
Merge series "ASoC: rsnd: cleanup ppcheck warning for Renesas sound driver" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark, Pierre-Louis
These patches are based on below patch-set which from Pierre-Louis,
and cleanup cppcheck warnings for Rensas sound driver.
[3/5] has Reported-by Pierre-Louis tag.
Subject: [PATCH 0/8] ASoC: sh: remove cppcheck warnings
Date: Fri, 19 Feb 2021 17:16:27 -0600
Kuninori Morimoto (5):
ASoC: rsnd: cleanup ppcheck warning for ssiu.c
ASoC: rsnd: cleanup ppcheck warning for ssi.c
ASoC: rsnd: cleanup ppcheck warning for core.c
ASoC: rsnd: cleanup ppcheck warning for cmd.c
ASoC: rsnd: cleanup ppcheck warning for adg.c
sound/soc/sh/rcar/adg.c | 15 +++++++-------
sound/soc/sh/rcar/cmd.c | 15 +++++++-------
sound/soc/sh/rcar/core.c | 32 +++++++++++++---------------
sound/soc/sh/rcar/ssi.c | 45 ++++++++++++++++++++--------------------
sound/soc/sh/rcar/ssiu.c | 22 +++++++++++---------
5 files changed, 64 insertions(+), 65 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc/sh/rcar/cmd.c')
| -rw-r--r-- | sound/soc/sh/rcar/cmd.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index e6bb6a9a0684..9fdb37c2cbc2 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -43,8 +43,6 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, if (mix) { struct rsnd_dai *rdai; - struct rsnd_mod *src; - struct rsnd_dai_stream *tio; int i; /* @@ -54,8 +52,9 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, */ data = 0; for_each_rsnd_dai(rdai, priv, i) { - tio = &rdai->playback; - src = rsnd_io_to_mod_src(tio); + struct rsnd_dai_stream *tio = &rdai->playback; + struct rsnd_mod *src = rsnd_io_to_mod_src(tio); + if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; @@ -142,7 +141,7 @@ int rsnd_cmd_probe(struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_cmd *cmd; - int i, nr, ret; + int i, nr; /* This driver doesn't support Gen1 at this point */ if (rsnd_is_gen1(priv)) @@ -161,9 +160,9 @@ int rsnd_cmd_probe(struct rsnd_priv *priv) priv->cmd = cmd; for_each_rsnd_cmd(cmd, priv, i) { - ret = rsnd_mod_init(priv, rsnd_mod_get(cmd), - &rsnd_cmd_ops, NULL, - RSND_MOD_CMD, i); + int ret = rsnd_mod_init(priv, rsnd_mod_get(cmd), + &rsnd_cmd_ops, NULL, + RSND_MOD_CMD, i); if (ret) return ret; } |