regmap: merge regmap_update_bits_check() 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() 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>

1 files changed, 2 insertions, 12 deletions

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 90c8b0e99f9d..dd227dd5e5f8 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -69,6 +69,8 @@ struct reg_sequence {
         regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
 #define regmap_update_bits_async(map, reg, mask, val)\
         regmap_update_bits_base(map, reg, mask, val, NULL, true, false)
+#define regmap_update_bits_check(map, reg, mask, val, change)\
+        regmap_update_bits_base(map, reg, mask, val, change, false, false)
 
 #ifdef CONFIG_REGMAP
 
@@ -701,9 +703,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg,
                             bool *change, bool async, bool force);
 int regmap_write_bits(struct regmap *map, unsigned int reg,
                        unsigned int mask, unsigned int val);
-int regmap_update_bits_check(struct regmap *map, unsigned int reg,
-                             unsigned int mask, unsigned int val,
-                             bool *change);
 int regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
                                    unsigned int mask, unsigned int val,
                                    bool *change);
@@ -956,15 +955,6 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
         return -EINVAL;
 }
 
-static inline int regmap_update_bits_check(struct regmap *map,
-                                           unsigned int reg,
-                                           unsigned int mask, unsigned int val,
-                                           bool *change)
-{
-        WARN_ONCE(1, "regmap API is disabled");
-        return -EINVAL;
-}
-
 static inline int regmap_update_bits_check_async(struct regmap *map,
                                                  unsigned int reg,
                                                  unsigned int mask,