diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-15 00:25:32 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-19 11:15:56 -0500 |
commit | 48138609135fc9c363f034596e14bff5dbf9f33f (patch) | |
tree | e05962b03238d16ca6c37a50061365d2af7a4189 /include/linux | |
parent | bbf2c46f46e23a496337e143cd012c013c6c7910 (diff) |
regmap: merge regmap_fields_update_bits() into macro
This patch merges regmap_fields_update_bits() into macro
by using regmap_field_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')
-rw-r--r-- | include/linux/regmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 5f438a4df5e6..7d3d498fd3e8 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -81,6 +81,8 @@ struct reg_sequence { | |||
81 | 81 | ||
82 | #define regmap_fields_write(field, id, val) \ | 82 | #define regmap_fields_write(field, id, val) \ |
83 | regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, false) | 83 | regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, false) |
84 | #define regmap_fields_update_bits(field, id, mask, val)\ | ||
85 | regmap_fields_update_bits_base(field, id, mask, val, NULL, false, false) | ||
84 | 86 | ||
85 | #ifdef CONFIG_REGMAP | 87 | #ifdef CONFIG_REGMAP |
86 | 88 | ||
@@ -787,8 +789,6 @@ int regmap_fields_force_write(struct regmap_field *field, unsigned int id, | |||
787 | unsigned int val); | 789 | unsigned int val); |
788 | int regmap_fields_read(struct regmap_field *field, unsigned int id, | 790 | int regmap_fields_read(struct regmap_field *field, unsigned int id, |
789 | unsigned int *val); | 791 | unsigned int *val); |
790 | int regmap_fields_update_bits(struct regmap_field *field, unsigned int id, | ||
791 | unsigned int mask, unsigned int val); | ||
792 | int regmap_fields_update_bits_base(struct regmap_field *field, unsigned int id, | 792 | int regmap_fields_update_bits_base(struct regmap_field *field, unsigned int id, |
793 | unsigned int mask, unsigned int val, | 793 | unsigned int mask, unsigned int val, |
794 | bool *change, bool async, bool force); | 794 | bool *change, bool async, bool force); |