Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 266996
b: refs/heads/master
c: 954757d
h: refs/heads/master
v: v3
  • Loading branch information
Dimitris Papastamos authored and Mark Brown committed Sep 27, 2011
1 parent 853d0a4 commit 6cb6f8b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfdc4448e078d06bdba0da52db7176437877788f
refs/heads/master: 954757d767a78bc4b863fa9ea703bd7f814c8a55
33 changes: 26 additions & 7 deletions trunk/drivers/base/regmap/regcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,20 +223,39 @@ EXPORT_SYMBOL_GPL(regcache_write);
*/
int regcache_sync(struct regmap *map)
{
int ret;
int ret = 0;
unsigned int val;
unsigned int i;
const char *name;

BUG_ON(!map->cache_ops);

dev_dbg(map->dev, "Syncing %s cache\n",
map->cache_ops->name);
name = map->cache_ops->name;
trace_regcache_sync(map->dev, name, "start");
if (map->cache_ops->sync) {
dev_dbg(map->dev, "Syncing %s cache\n",
map->cache_ops->name);
name = map->cache_ops->name;
trace_regcache_sync(map->dev, name, "start");
ret = map->cache_ops->sync(map);
trace_regcache_sync(map->dev, name, "stop");
} else {
for (i = 0; i < map->num_reg_defaults; i++) {
ret = regcache_read(map, i, &val);
if (ret < 0)
goto out;
regcache_cache_bypass(map, true);
ret = regcache_write(map, i, val);
regcache_cache_bypass(map, false);
if (ret < 0)
goto out;
dev_dbg(map->dev, "Synced register %#x, value %#x\n",
map->reg_defaults[i].reg,
map->reg_defaults[i].def);
}

}
return 0;
out:
trace_regcache_sync(map->dev, name, "stop");

return ret;
}
EXPORT_SYMBOL_GPL(regcache_sync);

Expand Down

0 comments on commit 6cb6f8b

Please sign in to comment.