Skip to content

Commit

Permalink
regmap: Return a sensible error code if we fail to read the cache
Browse files Browse the repository at this point in the history
If a register isn't cached then let callers know that so they can fall
back or error handle appropriately.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Oct 10, 2011
1 parent f094fea commit 6e6ace0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
7 changes: 3 additions & 4 deletions drivers/base/regmap/regcache-indexed.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ static int regcache_indexed_read(struct regmap *map, unsigned int reg,
int ret;

ret = regcache_lookup_reg(map, reg);
if (ret < 0)
*value = 0;
else
if (ret >= 0)
*value = map->reg_defaults[ret].def;
return 0;

return ret;
}

static int regcache_indexed_write(struct regmap *map, unsigned int reg,
Expand Down
4 changes: 2 additions & 2 deletions drivers/base/regmap/regcache-lzo.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ static int regcache_lzo_read(struct regmap *map,
size_t blksize, tmp_dst_len;
void *tmp_dst;

*value = 0;
/* index of the compressed lzo block */
blkindex = regcache_lzo_get_blkindex(map, reg);
/* register index within the decompressed block */
Expand Down Expand Up @@ -261,7 +260,8 @@ static int regcache_lzo_read(struct regmap *map,
/* restore the pointer and length of the compressed block */
lzo_block->dst = tmp_dst;
lzo_block->dst_len = tmp_dst_len;
return 0;

return ret;
}

static int regcache_lzo_write(struct regmap *map,
Expand Down
3 changes: 1 addition & 2 deletions drivers/base/regmap/regcache-rbtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ static int regcache_rbtree_read(struct regmap *map,
*value = regcache_rbtree_get_register(rbnode, reg_tmp,
map->cache_word_size);
} else {
/* uninitialized registers default to 0 */
*value = 0;
return -ENOENT;
}

return 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/base/regmap/regcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)
if (r)
return r - map->reg_defaults;
else
return -1;
return -ENOENT;
}

int regcache_insert_reg(struct regmap *map, unsigned int reg,
Expand Down

0 comments on commit 6e6ace0

Please sign in to comment.