openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regmap: Make reg_config reg_defaults const 

The reg_defaults field usually points to a static per driver array, which should
not be modified. Make requirement this explicit by making reg_defaults const.
To allow this the regcache_init code needs some minor changes. Previoulsy the
reg_config was not available in regcache_init and regmap->reg_defaults was used
to pass the default register set to regcache_init. Now that the reg_config is
available we can work on it directly.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lars-Peter Clausen 2011-11-16 16:28:17 +01:00 committed by Mark Brown
parent e5e3b8abed
commit 720e4616e8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/regmap/regcache.c
View File

@ -108,7 +108,6 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
return -EINVAL; return -EINVAL;
} }
map->reg_defaults = config->reg_defaults;
map->num_reg_defaults = config->num_reg_defaults; map->num_reg_defaults = config->num_reg_defaults;
map->num_reg_defaults_raw = config->num_reg_defaults_raw; map->num_reg_defaults_raw = config->num_reg_defaults_raw;
map->reg_defaults_raw = config->reg_defaults_raw; map->reg_defaults_raw = config->reg_defaults_raw;
@ -127,10 +126,10 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
* won't vanish from under us. We'll need to make * won't vanish from under us. We'll need to make
* a copy of it. * a copy of it.
*/ */
if (map->reg_defaults) { if (config->reg_defaults) {
if (!map->num_reg_defaults) if (!map->num_reg_defaults)
return -EINVAL; return -EINVAL;
tmp_buf = kmemdup(map->reg_defaults, map->num_reg_defaults * tmp_buf = kmemdup(config->reg_defaults, map->num_reg_defaults *
sizeof(struct reg_default), GFP_KERNEL); sizeof(struct reg_default), GFP_KERNEL);
if (!tmp_buf) if (!tmp_buf)
return -ENOMEM; return -ENOMEM;

2
include/linux/regmap.h
View File

@ -83,7 +83,7 @@ struct regmap_config {
bool (*precious_reg)(struct device *dev, unsigned int reg); bool (*precious_reg)(struct device *dev, unsigned int reg);
unsigned int max_register; unsigned int max_register;
struct reg_default *reg_defaults; const struct reg_default *reg_defaults;
unsigned int num_reg_defaults; unsigned int num_reg_defaults;
enum regcache_type cache_type; enum regcache_type cache_type;
const void *reg_defaults_raw; const void *reg_defaults_raw;