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
This commit is contained in:
Mark Brown
commit
fa576ff64f
|
|
@ -64,13 +64,13 @@ static const char * const clk_name[] = {
|
|||
|
||||
static u32 rsnd_adg_calculate_rbgx(unsigned long div)
|
||||
{
|
||||
int i, ratio;
|
||||
int i;
|
||||
|
||||
if (!div)
|
||||
return 0;
|
||||
|
||||
for (i = 3; i >= 0; i--) {
|
||||
ratio = 2 << (i * 2);
|
||||
int ratio = 2 << (i * 2);
|
||||
if (0 == (div % ratio))
|
||||
return (u32)((i << 8) | ((div / ratio) - 1));
|
||||
}
|
||||
|
|
@ -111,7 +111,7 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,
|
|||
{
|
||||
struct rsnd_adg *adg = rsnd_priv_to_adg(priv);
|
||||
struct device *dev = rsnd_priv_to_dev(priv);
|
||||
int idx, sel, div, step;
|
||||
int sel;
|
||||
unsigned int val, en;
|
||||
unsigned int min, diff;
|
||||
unsigned int sel_rate[] = {
|
||||
|
|
@ -126,8 +126,9 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,
|
|||
val = 0;
|
||||
en = 0;
|
||||
for (sel = 0; sel < ARRAY_SIZE(sel_rate); sel++) {
|
||||
idx = 0;
|
||||
step = 2;
|
||||
int idx = 0;
|
||||
int step = 2;
|
||||
int div;
|
||||
|
||||
if (!sel_rate[sel])
|
||||
continue;
|
||||
|
|
@ -394,11 +395,11 @@ static void rsnd_adg_get_clkin(struct rsnd_priv *priv,
|
|||
struct rsnd_adg *adg)
|
||||
{
|
||||
struct device *dev = rsnd_priv_to_dev(priv);
|
||||
struct clk *clk;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < CLKMAX; i++) {
|
||||
clk = devm_clk_get(dev, clk_name[i]);
|
||||
struct clk *clk = devm_clk_get(dev, clk_name[i]);
|
||||
|
||||
adg->clk[i] = IS_ERR(clk) ? NULL : clk;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,12 +230,12 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
|
|||
struct rsnd_dai_stream *io))
|
||||
{
|
||||
struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
|
||||
struct rsnd_dai_stream *io;
|
||||
struct rsnd_dai *rdai;
|
||||
int i;
|
||||
|
||||
for_each_rsnd_dai(rdai, priv, i) {
|
||||
io = &rdai->playback;
|
||||
struct rsnd_dai_stream *io = &rdai->playback;
|
||||
|
||||
if (mod == io->mod[mod->type])
|
||||
callback(mod, io);
|
||||
|
||||
|
|
@ -486,13 +486,12 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
|
|||
enum rsnd_mod_type *array,
|
||||
int array_size)
|
||||
{
|
||||
struct rsnd_mod *mod;
|
||||
enum rsnd_mod_type type;
|
||||
int max = array ? array_size : RSND_MOD_MAX;
|
||||
|
||||
for (; *iterator < max; (*iterator)++) {
|
||||
type = (array) ? array[*iterator] : *iterator;
|
||||
mod = rsnd_io_to_mod(io, type);
|
||||
enum rsnd_mod_type type = (array) ? array[*iterator] : *iterator;
|
||||
struct rsnd_mod *mod = rsnd_io_to_mod(io, type);
|
||||
|
||||
if (mod)
|
||||
return mod;
|
||||
}
|
||||
|
|
@ -1061,7 +1060,7 @@ static void rsnd_parse_tdm_split_mode(struct rsnd_priv *priv,
|
|||
struct device_node *ssiu_np = rsnd_ssiu_of_node(priv);
|
||||
struct device_node *np;
|
||||
int is_play = rsnd_io_is_play(io);
|
||||
int i, j;
|
||||
int i;
|
||||
|
||||
if (!ssiu_np)
|
||||
return;
|
||||
|
|
@ -1078,13 +1077,11 @@ static void rsnd_parse_tdm_split_mode(struct rsnd_priv *priv,
|
|||
if (!node)
|
||||
break;
|
||||
|
||||
j = 0;
|
||||
for_each_child_of_node(ssiu_np, np) {
|
||||
if (np == node) {
|
||||
rsnd_flags_set(io, RSND_STREAM_TDM_SPLIT);
|
||||
dev_dbg(dev, "%s is part of TDM Split\n", io->name);
|
||||
}
|
||||
j++;
|
||||
}
|
||||
|
||||
of_node_put(node);
|
||||
|
|
@ -1140,7 +1137,6 @@ void rsnd_parse_connect_common(struct rsnd_dai *rdai,
|
|||
{
|
||||
struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
|
||||
struct device_node *np;
|
||||
struct rsnd_mod *mod;
|
||||
int i;
|
||||
|
||||
if (!node)
|
||||
|
|
@ -1148,7 +1144,8 @@ void rsnd_parse_connect_common(struct rsnd_dai *rdai,
|
|||
|
||||
i = 0;
|
||||
for_each_child_of_node(node, np) {
|
||||
mod = mod_get(priv, i);
|
||||
struct rsnd_mod *mod = mod_get(priv, i);
|
||||
|
||||
if (np == playback)
|
||||
rsnd_dai_connect(mod, &rdai->playback, mod->type);
|
||||
if (np == capture)
|
||||
|
|
@ -1258,7 +1255,6 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
|
|||
struct device_node *dai_np,
|
||||
int dai_i)
|
||||
{
|
||||
struct device_node *playback, *capture;
|
||||
struct rsnd_dai_stream *io_playback;
|
||||
struct rsnd_dai_stream *io_capture;
|
||||
struct snd_soc_dai_driver *drv;
|
||||
|
|
@ -1301,8 +1297,8 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
|
|||
rsnd_rdai_width_set(rdai, 32); /* default 32bit width */
|
||||
|
||||
for (io_i = 0;; io_i++) {
|
||||
playback = of_parse_phandle(dai_np, "playback", io_i);
|
||||
capture = of_parse_phandle(dai_np, "capture", io_i);
|
||||
struct device_node *playback = of_parse_phandle(dai_np, "playback", io_i);
|
||||
struct device_node *capture = of_parse_phandle(dai_np, "capture", io_i);
|
||||
|
||||
if (!playback && !capture)
|
||||
break;
|
||||
|
|
@ -1366,7 +1362,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
|
|||
for_each_endpoint_of_node(dai_node, dai_np) {
|
||||
__rsnd_dai_probe(priv, dai_np, dai_i);
|
||||
if (rsnd_is_gen3(priv)) {
|
||||
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
|
||||
rdai = rsnd_rdai_get(priv, dai_i);
|
||||
|
||||
rsnd_parse_connect_graph(priv, &rdai->playback, dai_np);
|
||||
rsnd_parse_connect_graph(priv, &rdai->capture, dai_np);
|
||||
|
|
@ -1377,7 +1373,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
|
|||
for_each_child_of_node(dai_node, dai_np) {
|
||||
__rsnd_dai_probe(priv, dai_np, dai_i);
|
||||
if (rsnd_is_gen3(priv)) {
|
||||
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
|
||||
rdai = rsnd_rdai_get(priv, dai_i);
|
||||
|
||||
rsnd_parse_connect_simple(priv, &rdai->playback, dai_np);
|
||||
rsnd_parse_connect_simple(priv, &rdai->capture, dai_np);
|
||||
|
|
@ -1416,11 +1412,11 @@ static int rsnd_hw_params(struct snd_soc_component *component,
|
|||
struct rsnd_priv *priv = rsnd_io_to_priv(io);
|
||||
struct device *dev = rsnd_priv_to_dev(priv);
|
||||
struct snd_soc_dpcm *dpcm;
|
||||
struct snd_pcm_hw_params *be_params;
|
||||
int stream = substream->stream;
|
||||
|
||||
for_each_dpcm_be(fe, stream, dpcm) {
|
||||
be_params = &dpcm->hw_params;
|
||||
struct snd_pcm_hw_params *be_params = &dpcm->hw_params;
|
||||
|
||||
if (params_channels(hw_params) != params_channels(be_params))
|
||||
io->converted_chan = params_channels(be_params);
|
||||
if (params_rate(hw_params) != params_rate(be_params))
|
||||
|
|
|
|||
|
|
@ -24,23 +24,23 @@
|
|||
/*
|
||||
* SSICR
|
||||
*/
|
||||
#define FORCE (1 << 31) /* Fixed */
|
||||
#define DMEN (1 << 28) /* DMA Enable */
|
||||
#define UIEN (1 << 27) /* Underflow Interrupt Enable */
|
||||
#define OIEN (1 << 26) /* Overflow Interrupt Enable */
|
||||
#define IIEN (1 << 25) /* Idle Mode Interrupt Enable */
|
||||
#define DIEN (1 << 24) /* Data Interrupt Enable */
|
||||
#define CHNL_4 (1 << 22) /* Channels */
|
||||
#define CHNL_6 (2 << 22) /* Channels */
|
||||
#define CHNL_8 (3 << 22) /* Channels */
|
||||
#define DWL_MASK (7 << 19) /* Data Word Length mask */
|
||||
#define DWL_8 (0 << 19) /* Data Word Length */
|
||||
#define DWL_16 (1 << 19) /* Data Word Length */
|
||||
#define DWL_18 (2 << 19) /* Data Word Length */
|
||||
#define DWL_20 (3 << 19) /* Data Word Length */
|
||||
#define DWL_22 (4 << 19) /* Data Word Length */
|
||||
#define DWL_24 (5 << 19) /* Data Word Length */
|
||||
#define DWL_32 (6 << 19) /* Data Word Length */
|
||||
#define FORCE (1u << 31) /* Fixed */
|
||||
#define DMEN (1u << 28) /* DMA Enable */
|
||||
#define UIEN (1u << 27) /* Underflow Interrupt Enable */
|
||||
#define OIEN (1u << 26) /* Overflow Interrupt Enable */
|
||||
#define IIEN (1u << 25) /* Idle Mode Interrupt Enable */
|
||||
#define DIEN (1u << 24) /* Data Interrupt Enable */
|
||||
#define CHNL_4 (1u << 22) /* Channels */
|
||||
#define CHNL_6 (2u << 22) /* Channels */
|
||||
#define CHNL_8 (3u << 22) /* Channels */
|
||||
#define DWL_MASK (7u << 19) /* Data Word Length mask */
|
||||
#define DWL_8 (0u << 19) /* Data Word Length */
|
||||
#define DWL_16 (1u << 19) /* Data Word Length */
|
||||
#define DWL_18 (2u << 19) /* Data Word Length */
|
||||
#define DWL_20 (3u << 19) /* Data Word Length */
|
||||
#define DWL_22 (4u << 19) /* Data Word Length */
|
||||
#define DWL_24 (5u << 19) /* Data Word Length */
|
||||
#define DWL_32 (6u << 19) /* Data Word Length */
|
||||
|
||||
/*
|
||||
* System word length
|
||||
|
|
@ -167,7 +167,6 @@ static void rsnd_ssi_status_check(struct rsnd_mod *mod,
|
|||
|
||||
static u32 rsnd_ssi_multi_secondaries(struct rsnd_dai_stream *io)
|
||||
{
|
||||
struct rsnd_mod *mod;
|
||||
enum rsnd_mod_type types[] = {
|
||||
RSND_MOD_SSIM1,
|
||||
RSND_MOD_SSIM2,
|
||||
|
|
@ -177,7 +176,8 @@ static u32 rsnd_ssi_multi_secondaries(struct rsnd_dai_stream *io)
|
|||
|
||||
mask = 0;
|
||||
for (i = 0; i < ARRAY_SIZE(types); i++) {
|
||||
mod = rsnd_io_to_mod(io, types[i]);
|
||||
struct rsnd_mod *mod = rsnd_io_to_mod(io, types[i]);
|
||||
|
||||
if (!mod)
|
||||
continue;
|
||||
|
||||
|
|
@ -532,7 +532,6 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod,
|
|||
struct device *dev = rsnd_priv_to_dev(priv);
|
||||
int is_tdm, is_tdm_split;
|
||||
int id = rsnd_mod_id(mod);
|
||||
int i;
|
||||
u32 sys_int_enable = 0;
|
||||
|
||||
is_tdm = rsnd_runtime_is_tdm(io);
|
||||
|
|
@ -560,6 +559,8 @@ static int rsnd_ssi_quit(struct rsnd_mod *mod,
|
|||
|
||||
/* disable busif buffer over/under run interrupt. */
|
||||
if (is_tdm || is_tdm_split) {
|
||||
int i;
|
||||
|
||||
switch (id) {
|
||||
case 0:
|
||||
case 1:
|
||||
|
|
@ -1209,7 +1210,6 @@ void rsnd_parse_connect_ssi(struct rsnd_dai *rdai,
|
|||
struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
|
||||
struct device_node *node;
|
||||
struct device_node *np;
|
||||
struct rsnd_mod *mod;
|
||||
int i;
|
||||
|
||||
node = rsnd_ssi_of_node(priv);
|
||||
|
|
@ -1218,7 +1218,8 @@ void rsnd_parse_connect_ssi(struct rsnd_dai *rdai,
|
|||
|
||||
i = 0;
|
||||
for_each_child_of_node(node, np) {
|
||||
mod = rsnd_ssi_mod_get(priv, i);
|
||||
struct rsnd_mod *mod = rsnd_ssi_mod_get(priv, i);
|
||||
|
||||
if (np == playback)
|
||||
rsnd_ssi_connect(mod, &rdai->playback);
|
||||
if (np == capture)
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
|
|||
struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);
|
||||
struct rsnd_mod *pos;
|
||||
u32 val;
|
||||
int i, shift;
|
||||
int i;
|
||||
|
||||
i = rsnd_mod_id(ssi_mod);
|
||||
|
||||
|
|
@ -221,7 +221,8 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
|
|||
i;
|
||||
|
||||
for_each_rsnd_mod_array(i, pos, io, rsnd_ssi_array) {
|
||||
shift = (i * 4) + 20;
|
||||
int shift = (i * 4) + 20;
|
||||
|
||||
val = (val & ~(0xF << shift)) |
|
||||
rsnd_mod_id(pos) << shift;
|
||||
}
|
||||
|
|
@ -334,7 +335,6 @@ static void rsnd_parse_connect_ssiu_compatible(struct rsnd_priv *priv,
|
|||
struct rsnd_dai_stream *io)
|
||||
{
|
||||
struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io);
|
||||
struct rsnd_mod *mod;
|
||||
struct rsnd_ssiu *ssiu;
|
||||
int i;
|
||||
|
||||
|
|
@ -343,7 +343,7 @@ static void rsnd_parse_connect_ssiu_compatible(struct rsnd_priv *priv,
|
|||
|
||||
/* select BUSIF0 */
|
||||
for_each_rsnd_ssiu(ssiu, priv, i) {
|
||||
mod = rsnd_mod_get(ssiu);
|
||||
struct rsnd_mod *mod = rsnd_mod_get(ssiu);
|
||||
|
||||
if ((rsnd_mod_id(ssi_mod) == rsnd_mod_id(mod)) &&
|
||||
(rsnd_mod_id_sub(mod) == 0)) {
|
||||
|
|
@ -359,17 +359,17 @@ void rsnd_parse_connect_ssiu(struct rsnd_dai *rdai,
|
|||
{
|
||||
struct rsnd_priv *priv = rsnd_rdai_to_priv(rdai);
|
||||
struct device_node *node = rsnd_ssiu_of_node(priv);
|
||||
struct device_node *np;
|
||||
struct rsnd_mod *mod;
|
||||
struct rsnd_dai_stream *io_p = &rdai->playback;
|
||||
struct rsnd_dai_stream *io_c = &rdai->capture;
|
||||
int i;
|
||||
|
||||
/* use rcar_sound,ssiu if exist */
|
||||
if (node) {
|
||||
i = 0;
|
||||
struct device_node *np;
|
||||
int i = 0;
|
||||
|
||||
for_each_child_of_node(node, np) {
|
||||
mod = rsnd_ssiu_mod_get(priv, i);
|
||||
struct rsnd_mod *mod = rsnd_ssiu_mod_get(priv, i);
|
||||
|
||||
if (np == playback)
|
||||
rsnd_dai_connect(mod, io_p, mod->type);
|
||||
if (np == capture)
|
||||
|
|
@ -394,7 +394,7 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv)
|
|||
struct rsnd_ssiu *ssiu;
|
||||
struct rsnd_mod_ops *ops;
|
||||
const int *list = NULL;
|
||||
int i, nr, ret;
|
||||
int i, nr;
|
||||
|
||||
/*
|
||||
* Keep DT compatibility.
|
||||
|
|
@ -441,6 +441,8 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv)
|
|||
}
|
||||
|
||||
for_each_rsnd_ssiu(ssiu, priv, i) {
|
||||
int ret;
|
||||
|
||||
if (node) {
|
||||
int j;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue