diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-15 05:23:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-20 01:15:56 +0900 |
| commit | 89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a (patch) | |
| tree | 68e7f922970dd217b53a40f6ac109672583f87b0 /include/linux/regmap.h | |
| parent | 98c2dc48694a47109fff430a216fc13a9b45a4a1 (diff) | |
| download | linux-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 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index dd227dd5e5f8..4d8e1edb4407 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -71,6 +71,8 @@ struct reg_sequence { 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) +#define regmap_update_bits_check_async(map, reg, mask, val, change)\ + regmap_update_bits_base(map, reg, mask, val, change, true, false) #ifdef CONFIG_REGMAP @@ -703,9 +705,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_async(struct regmap *map, unsigned int reg, - unsigned int mask, unsigned int val, - bool *change); int regmap_get_val_bytes(struct regmap *map); int regmap_get_max_register(struct regmap *map); int regmap_get_reg_stride(struct regmap *map); @@ -955,16 +954,6 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg, return -EINVAL; } -static inline int regmap_update_bits_check_async(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_get_val_bytes(struct regmap *map) { WARN_ONCE(1, "regmap API is disabled"); |