aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-10-21 23:13:27 -0400
committerMark Brown <broonie@kernel.org>2015-10-22 08:30:01 -0400
commit9993c16d460e2965da4357575060373a5577167a (patch)
treeaeca02fa94217148a66b234c627ecd651a73f308 /sound/soc/sh
parentc9b9638f617871aa83c197eed8f068294c843b69 (diff)
ASoC: rsnd: fixup struct rsnd_gen::res array size
struct rsnd_gen :: res array size should be RSND_BASE_MAX, not RSND_REG_MAX. This patch fixup it, and indicates whether each data array size is based on what Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/rcar/gen.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 0c69f83f0d58..76da7620904c 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -22,13 +22,15 @@
22#include "rsnd.h" 22#include "rsnd.h"
23 23
24struct rsnd_gen { 24struct rsnd_gen {
25 void __iomem *base[RSND_BASE_MAX];
26
27 struct rsnd_gen_ops *ops; 25 struct rsnd_gen_ops *ops;
28 26
27 /* RSND_BASE_MAX base */
28 void __iomem *base[RSND_BASE_MAX];
29 phys_addr_t res[RSND_BASE_MAX];
29 struct regmap *regmap[RSND_BASE_MAX]; 30 struct regmap *regmap[RSND_BASE_MAX];
31
32 /* RSND_REG_MAX base */
30 struct regmap_field *regs[RSND_REG_MAX]; 33 struct regmap_field *regs[RSND_REG_MAX];
31 phys_addr_t res[RSND_REG_MAX];
32}; 34};
33 35
34#define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen) 36#define rsnd_priv_to_gen(p) ((struct rsnd_gen *)(p)->gen)
@@ -182,6 +184,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
182 if (IS_ERR(regmap)) 184 if (IS_ERR(regmap))
183 return PTR_ERR(regmap); 185 return PTR_ERR(regmap);
184 186
187 /* RSND_BASE_MAX base */
185 gen->base[reg_id] = base; 188 gen->base[reg_id] = base;
186 gen->regmap[reg_id] = regmap; 189 gen->regmap[reg_id] = regmap;
187 gen->res[reg_id] = res->start; 190 gen->res[reg_id] = res->start;
@@ -198,6 +201,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
198 if (IS_ERR(regs)) 201 if (IS_ERR(regs))
199 return PTR_ERR(regs); 202 return PTR_ERR(regs);
200 203
204 /* RSND_REG_MAX base */
201 gen->regs[conf[i].idx] = regs; 205 gen->regs[conf[i].idx] = regs;
202 } 206 }
203 207