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>
This commit is contained in:
parent
c2b1ecd13c
commit
e5e3b8abed
|
@ -106,7 +106,7 @@ static inline void regmap_debugfs_exit(struct regmap *map) { }
|
|||
#endif
|
||||
|
||||
/* regcache core declarations */
|
||||
int regcache_init(struct regmap *map);
|
||||
int regcache_init(struct regmap *map, const struct regmap_config *config);
|
||||
void regcache_exit(struct regmap *map);
|
||||
int regcache_read(struct regmap *map,
|
||||
unsigned int reg, unsigned int *value);
|
||||
|
|
|
@ -87,7 +87,7 @@ err_free:
|
|||
return ret;
|
||||
}
|
||||
|
||||
int regcache_init(struct regmap *map)
|
||||
int regcache_init(struct regmap *map, const struct regmap_config *config)
|
||||
{
|
||||
int ret;
|
||||
int i;
|
||||
|
@ -108,6 +108,13 @@ int regcache_init(struct regmap *map)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
map->reg_defaults = config->reg_defaults;
|
||||
map->num_reg_defaults = config->num_reg_defaults;
|
||||
map->num_reg_defaults_raw = config->num_reg_defaults_raw;
|
||||
map->reg_defaults_raw = config->reg_defaults_raw;
|
||||
map->cache_size_raw = (config->val_bits / 8) * config->num_reg_defaults_raw;
|
||||
map->cache_word_size = config->val_bits / 8;
|
||||
|
||||
map->cache = NULL;
|
||||
map->cache_ops = cache_types[i];
|
||||
|
||||
|
|
|
@ -159,12 +159,6 @@ struct regmap *regmap_init(struct device *dev,
|
|||
map->volatile_reg = config->volatile_reg;
|
||||
map->precious_reg = config->precious_reg;
|
||||
map->cache_type = config->cache_type;
|
||||
map->reg_defaults = config->reg_defaults;
|
||||
map->num_reg_defaults = config->num_reg_defaults;
|
||||
map->num_reg_defaults_raw = config->num_reg_defaults_raw;
|
||||
map->reg_defaults_raw = config->reg_defaults_raw;
|
||||
map->cache_size_raw = (config->val_bits / 8) * config->num_reg_defaults_raw;
|
||||
map->cache_word_size = config->val_bits / 8;
|
||||
|
||||
if (config->read_flag_mask || config->write_flag_mask) {
|
||||
map->read_flag_mask = config->read_flag_mask;
|
||||
|
@ -227,7 +221,7 @@ struct regmap *regmap_init(struct device *dev,
|
|||
goto err_map;
|
||||
}
|
||||
|
||||
ret = regcache_init(map);
|
||||
ret = regcache_init(map, config);
|
||||
if (ret < 0)
|
||||
goto err_free_workbuf;
|
||||
|
||||
|
|
Loading…
Reference in a new issue