diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-15 00:25:15 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-19 11:15:56 -0500 |
commit | bbf2c46f46e23a496337e143cd012c013c6c7910 (patch) | |
tree | 984bbaa66791e185fae496d560413343f7e486f1 /include/linux | |
parent | e126edec184ea3049cc1f8b652c6eeb06aa65fda (diff) |
regmap: merge regmap_fields_write() into macro
This patch merges regmap_fields_write() into macro
by using regmap_fields_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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 2735a3df7eab..5f438a4df5e6 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -79,6 +79,9 @@ struct reg_sequence { | |||
79 | #define regmap_field_update_bits(field, mask, val)\ | 79 | #define regmap_field_update_bits(field, mask, val)\ |
80 | regmap_field_update_bits_base(field, mask, val, NULL, false, false) | 80 | regmap_field_update_bits_base(field, mask, val, NULL, false, false) |
81 | 81 | ||
82 | #define regmap_fields_write(field, id, val) \ | ||
83 | regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, false) | ||
84 | |||
82 | #ifdef CONFIG_REGMAP | 85 | #ifdef CONFIG_REGMAP |
83 | 86 | ||
84 | enum regmap_endian { | 87 | enum regmap_endian { |
@@ -780,8 +783,6 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val); | |||
780 | int regmap_field_update_bits_base(struct regmap_field *field, | 783 | int regmap_field_update_bits_base(struct regmap_field *field, |
781 | unsigned int mask, unsigned int val, | 784 | unsigned int mask, unsigned int val, |
782 | bool *change, bool async, bool force); | 785 | bool *change, bool async, bool force); |
783 | int regmap_fields_write(struct regmap_field *field, unsigned int id, | ||
784 | unsigned int val); | ||
785 | int regmap_fields_force_write(struct regmap_field *field, unsigned int id, | 786 | int regmap_fields_force_write(struct regmap_field *field, unsigned int id, |
786 | unsigned int val); | 787 | unsigned int val); |
787 | int regmap_fields_read(struct regmap_field *field, unsigned int id, | 788 | int regmap_fields_read(struct regmap_field *field, unsigned int id, |