summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-02-15 05:22:42 +0000
committerMark Brown <broonie@kernel.org>2016-02-20 01:15:56 +0900
commitca7a94464b5457a8dc5add19f6fc3bea59d6193f (patch)
treef955c358eaeec7bf4556524cb744ea16f81430b4 /drivers/base
parent91d31b9f8e7662726f273fc32b25f4099d78de4a (diff)
regmap: merge regmap_update_bits() 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() 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.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 4e35b2f41304..281898a97e8f 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2688,29 +2688,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg,
EXPORT_SYMBOL_GPL(regmap_update_bits_base);
/**
- * regmap_update_bits: Perform a read/modify/write cycle on the register map
- *
- * @map: Register map to update
- * @reg: Register to update
- * @mask: Bitmask to change
- * @val: New value for bitmask
- *
- * Returns zero for success, a negative number on error.
- */
-int regmap_update_bits(struct regmap *map, unsigned int reg,
- unsigned int mask, unsigned int val)
-{
- int ret;
-
- map->lock(map->lock_arg);
- ret = _regmap_update_bits(map, reg, mask, val, NULL, false);
- map->unlock(map->lock_arg);
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(regmap_update_bits);
-
-/**
* regmap_write_bits: Perform a read/modify/write cycle on the register map
*
* @map: Register map to update