aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-10-09 05:02:53 -0400
committerMark Brown <broonie@kernel.org>2014-10-20 07:25:01 -0400
commit5bd83ed0984b0b0ac51d648b0ec167b36291f87e (patch)
tree7f63bf44cca2f17ec77a4a4bf18495777adc13c7
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
regmap: cache: cleanup regcache_hw_init()
Remove the redundant code for regmap cache. Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/base/regmap/regcache.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index f1280dc356d0..7558e6b01c04 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -57,12 +57,9 @@ static int regcache_hw_init(struct regmap *map)
57 } 57 }
58 58
59 /* calculate the size of reg_defaults */ 59 /* calculate the size of reg_defaults */
60 for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++) { 60 for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++)
61 val = regcache_get_val(map, map->reg_defaults_raw, i); 61 if (!regmap_volatile(map, i * map->reg_stride))
62 if (regmap_volatile(map, i * map->reg_stride)) 62 count++;
63 continue;
64 count++;
65 }
66 63
67 map->reg_defaults = kmalloc(count * sizeof(struct reg_default), 64 map->reg_defaults = kmalloc(count * sizeof(struct reg_default),
68 GFP_KERNEL); 65 GFP_KERNEL);