diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-15 00:22:18 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-19 11:15:56 -0500 |
commit | 91d31b9f8e7662726f273fc32b25f4099d78de4a (patch) | |
tree | 509bf8ccd4c366c25277b5e8ace26c01d5764f03 /include/linux/regmap.h | |
parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) |
regmap: add regmap_update_bits_base()
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 adds new regmap_update_bits_base() which is feature
merged function. Above functions can be merged into it by macro.
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 18394343f489..28e50a3d2872 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -691,6 +691,9 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, | |||
691 | void *val, size_t val_len); | 691 | void *val, size_t val_len); |
692 | int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, | 692 | int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, |
693 | size_t val_count); | 693 | size_t val_count); |
694 | int regmap_update_bits_base(struct regmap *map, unsigned int reg, | ||
695 | unsigned int mask, unsigned int val, | ||
696 | bool *change, bool async, bool force); | ||
694 | int regmap_update_bits(struct regmap *map, unsigned int reg, | 697 | int regmap_update_bits(struct regmap *map, unsigned int reg, |
695 | unsigned int mask, unsigned int val); | 698 | unsigned int mask, unsigned int val); |
696 | int regmap_write_bits(struct regmap *map, unsigned int reg, | 699 | int regmap_write_bits(struct regmap *map, unsigned int reg, |
@@ -937,6 +940,14 @@ static inline int regmap_bulk_read(struct regmap *map, unsigned int reg, | |||
937 | return -EINVAL; | 940 | return -EINVAL; |
938 | } | 941 | } |
939 | 942 | ||
943 | static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg, | ||
944 | unsigned int mask, unsigned int val, | ||
945 | bool *change, bool async, bool force) | ||
946 | { | ||
947 | WARN_ONCE(1, "regmap API is disabled"); | ||
948 | return -EINVAL; | ||
949 | } | ||
950 | |||
940 | static inline int regmap_update_bits(struct regmap *map, unsigned int reg, | 951 | static inline int regmap_update_bits(struct regmap *map, unsigned int reg, |
941 | unsigned int mask, unsigned int val) | 952 | unsigned int mask, unsigned int val) |
942 | { | 953 | { |