From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 3/8] regmap: Use the lockless _regmap_write() for syncing
Date: Thu, 29 Sep 2011 10:39:08 +0100 [thread overview]
Message-ID: <1317289153-21123-3-git-send-email-dp@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1317289153-21123-1-git-send-email-dp@opensource.wolfsonmicro.com>
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
drivers/base/regmap/regcache-indexed.c | 4 ++--
drivers/base/regmap/regcache-lzo.c | 2 +-
drivers/base/regmap/regcache-rbtree.c | 2 +-
drivers/base/regmap/regcache.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/base/regmap/regcache-indexed.c b/drivers/base/regmap/regcache-indexed.c
index 268497a..2e10bb1 100644
--- a/drivers/base/regmap/regcache-indexed.c
+++ b/drivers/base/regmap/regcache-indexed.c
@@ -45,8 +45,8 @@ static int regcache_indexed_sync(struct regmap *map)
int ret;
for (i = 0; i < map->num_reg_defaults; i++) {
- ret = regmap_write(map, map->reg_defaults[i].reg,
- map->reg_defaults[i].def);
+ ret = _regmap_write(map, map->reg_defaults[i].reg,
+ map->reg_defaults[i].def);
if (ret < 0)
return ret;
dev_dbg(map->dev, "Synced register %#x, value %#x\n",
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 9079cb5..ad6af92 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -339,7 +339,7 @@ static int regcache_lzo_sync(struct regmap *map)
if (ret)
return ret;
map->cache_bypass = 1;
- ret = regmap_write(map, i, val);
+ ret = _regmap_write(map, i, val);
map->cache_bypass = 0;
if (ret)
return ret;
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index de32ced..40f23dd 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -327,7 +327,7 @@ static int regcache_rbtree_sync(struct regmap *map)
if (val == def)
continue;
map->cache_bypass = 1;
- ret = regmap_write(map, regtmp, val);
+ ret = _regmap_write(map, regtmp, val);
map->cache_bypass = 0;
if (ret)
return ret;
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index f46e247..b6efde7 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -242,7 +242,7 @@ int regcache_sync(struct regmap *map)
if (ret < 0)
goto out;
map->cache_bypass = 1;
- ret = regmap_write(map, i, val);
+ ret = _regmap_write(map, i, val);
map->cache_bypass = 0;
if (ret < 0)
goto out;
--
1.7.6.4
next prev parent reply other threads:[~2011-09-29 9:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 9:39 [PATCH 1/8] Revert "regmap: Grab the lock in regcache_cache_only()" Dimitris Papastamos
2011-09-29 9:39 ` [PATCH 2/8] regmap: Make _regmap_write() global Dimitris Papastamos
2011-09-29 10:19 ` Mark Brown
2011-09-29 10:20 ` Mark Brown
2011-09-29 9:39 ` Dimitris Papastamos [this message]
2011-09-29 9:39 ` [PATCH 4/8] regmap: Guard regcache_sync() with map->lock Dimitris Papastamos
2011-09-29 10:22 ` Mark Brown
2011-09-29 13:26 ` Dimitris Papastamos
2011-09-29 9:39 ` [PATCH 5/8] regmap: Save/restore the bypass state upon syncing Dimitris Papastamos
2011-09-29 9:39 ` [PATCH 6/8] regmap: Grab the lock in regcache_cache_only() Dimitris Papastamos
2011-09-29 9:39 ` [PATCH 7/8] regmap: Implement regcache_cache_bypass helper function Dimitris Papastamos
2011-09-29 9:39 ` [PATCH 8/8] regmap: Ensure we scream if we enable cache bypass/only at the same time Dimitris Papastamos
2011-09-29 10:25 ` Mark Brown
2011-09-29 13:24 ` Dimitris Papastamos
2011-09-29 10:18 ` [PATCH 1/8] Revert "regmap: Grab the lock in regcache_cache_only()" Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317289153-21123-3-git-send-email-dp@opensource.wolfsonmicro.com \
--to=dp@opensource.wolfsonmicro.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox