diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-11-16 10:28:16 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-16 12:34:53 -0500 |
commit | e5e3b8abeda1cf45f5a079458dbc267952694c7a (patch) | |
tree | 46bd89885c027beaa4d549ea5f1d79f8a9279433 /drivers/base/regmap/regmap.c | |
parent | c2b1ecd13c6a7b19f1c0c48b68f61ab083f3ec3f (diff) |
regmap: Move initialization of regcache related fields to regcache_init
Move the initialization regcache related fields of the regmap struct to
regcache_init. This allows us to keep regmap and regcache code better
separated.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r-- | drivers/base/regmap/regmap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index b84ebf9eecf0..3cf4785c3afe 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -159,12 +159,6 @@ struct regmap *regmap_init(struct device *dev, | |||
159 | map->volatile_reg = config->volatile_reg; | 159 | map->volatile_reg = config->volatile_reg; |
160 | map->precious_reg = config->precious_reg; | 160 | map->precious_reg = config->precious_reg; |
161 | map->cache_type = config->cache_type; | 161 | map->cache_type = config->cache_type; |
162 | map->reg_defaults = config->reg_defaults; | ||
163 | map->num_reg_defaults = config->num_reg_defaults; | ||
164 | map->num_reg_defaults_raw = config->num_reg_defaults_raw; | ||
165 | map->reg_defaults_raw = config->reg_defaults_raw; | ||
166 | map->cache_size_raw = (config->val_bits / 8) * config->num_reg_defaults_raw; | ||
167 | map->cache_word_size = config->val_bits / 8; | ||
168 | 162 | ||
169 | if (config->read_flag_mask || config->write_flag_mask) { | 163 | if (config->read_flag_mask || config->write_flag_mask) { |
170 | map->read_flag_mask = config->read_flag_mask; | 164 | map->read_flag_mask = config->read_flag_mask; |
@@ -227,7 +221,7 @@ struct regmap *regmap_init(struct device *dev, | |||
227 | goto err_map; | 221 | goto err_map; |
228 | } | 222 | } |
229 | 223 | ||
230 | ret = regcache_init(map); | 224 | ret = regcache_init(map, config); |
231 | if (ret < 0) | 225 | if (ret < 0) |
232 | goto err_free_workbuf; | 226 | goto err_free_workbuf; |
233 | 227 | ||