summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-02-15 05:23:37 +0000
committerMark Brown <broonie@kernel.org>2016-02-20 01:15:56 +0900
commit89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a (patch)
tree68e7f922970dd217b53a40f6ac109672583f87b0 /drivers
parent98c2dc48694a47109fff430a216fc13a9b45a4a1 (diff)
downloadlinux-stable-89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a.tar.gz
linux-stable-89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a.tar.bz2
linux-stable-89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a.zip
regmap: merge regmap_update_bits_check_async() into macro
Current regmap has many similar update functions like below, but the difference is very few. regmap_update_bits() regmap_update_bits_async() regmap_update_bits_check() regmap_update_bits_check_async() Furthermore, we can add *force* write option too in the future. This patch merges regmap_update_bits_check_async() into macro by using regmap_update_bits_base(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/regmap/regmap.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index ce24e9688b05..015135a656b7 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2710,43 +2710,6 @@ int regmap_write_bits(struct regmap *map, unsigned int reg,
}
EXPORT_SYMBOL_GPL(regmap_write_bits);
-/**
- * regmap_update_bits_check_async: Perform a read/modify/write cycle on the
- * register map asynchronously and report if
- * updated
- *
- * @map: Register map to update
- * @reg: Register to update
- * @mask: Bitmask to change
- * @val: New value for bitmask
- * @change: Boolean indicating if a write was done
- *
- * With most buses the read must be done synchronously so this is most
- * useful for devices with a cache which do not need to interact with
- * the hardware to determine the current register value.
- *
- * Returns zero for success, a negative number on error.
- */
-int regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
- unsigned int mask, unsigned int val,
- bool *change)
-{
- int ret;
-
- map->lock(map->lock_arg);
-
- map->async = true;
-
- ret = _regmap_update_bits(map, reg, mask, val, change, false);
-
- map->async = false;
-
- map->unlock(map->lock_arg);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(regmap_update_bits_check_async);
-
void regmap_async_complete_cb(struct regmap_async *async, int ret)
{
struct regmap *map = async->map;