summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-02-15 08:23:01 +0300
committerMark Brown <broonie@kernel.org>2016-02-19 19:15:56 +0300
commit30ed9cb7a49b499ebc6061e4ff38e88cb4857cad (patch)
tree3a86bd1ee5fff53eb15bcbafc8eaca19e5d1de59 /drivers/base
parentca7a94464b5457a8dc5add19f6fc3bea59d6193f (diff)
downloadlinux-30ed9cb7a49b499ebc6061e4ff38e88cb4857cad.tar.xz
regmap: merge regmap_update_bits_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_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/base')
-rw-r--r--drivers/base/regmap/regmap.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 281898a97e8f..c2255f604c03 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2711,40 +2711,6 @@ int regmap_write_bits(struct regmap *map, unsigned int reg,
EXPORT_SYMBOL_GPL(regmap_write_bits);
/**
- * regmap_update_bits_async: Perform a read/modify/write cycle on the register
- * map asynchronously
- *
- * @map: Register map to update
- * @reg: Register to update
- * @mask: Bitmask to change
- * @val: New value for bitmask
- *
- * 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_async(struct regmap *map, unsigned int reg,
- unsigned int mask, unsigned int val)
-{
- int ret;
-
- map->lock(map->lock_arg);
-
- map->async = true;
-
- ret = _regmap_update_bits(map, reg, mask, val, NULL, false);
-
- map->async = false;
-
- map->unlock(map->lock_arg);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(regmap_update_bits_async);
-
-/**
* regmap_update_bits_check: Perform a read/modify/write cycle on the
* register map and report if updated
*