diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-02-15 00:24:33 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-19 11:15:56 -0500 |
commit | 721ed64dda3774c619874866ca4f9a38ae6750af (patch) | |
tree | 8cffd1def42a87a51c366de67aeb315ff5fad56c /include/linux/regmap.h | |
parent | 3674124b35894631f8f4d33ab041e713078bfd4b (diff) |
regmap: merge regmap_field_update_bits() into macro
This patch merges regmap_field_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/regmap.h')
-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 13e9ebdea1c7..e525beeaa2c6 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -76,6 +76,8 @@ struct reg_sequence { | |||
76 | 76 | ||
77 | #define regmap_field_write(field, val) \ | 77 | #define regmap_field_write(field, val) \ |
78 | regmap_field_update_bits_base(field, ~0, val, NULL, false, false) | 78 | regmap_field_update_bits_base(field, ~0, val, NULL, false, false) |
79 | #define regmap_field_update_bits(field, mask, val)\ | ||
80 | regmap_field_update_bits_base(field, mask, val, NULL, false, false) | ||
79 | 81 | ||
80 | #ifdef CONFIG_REGMAP | 82 | #ifdef CONFIG_REGMAP |
81 | 83 | ||
@@ -778,8 +780,6 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val); | |||
778 | int regmap_field_update_bits_base(struct regmap_field *field, | 780 | int regmap_field_update_bits_base(struct regmap_field *field, |
779 | unsigned int mask, unsigned int val, | 781 | unsigned int mask, unsigned int val, |
780 | bool *change, bool async, bool force); | 782 | bool *change, bool async, bool force); |
781 | int regmap_field_update_bits(struct regmap_field *field, | ||
782 | unsigned int mask, unsigned int val); | ||
783 | int regmap_fields_write(struct regmap_field *field, unsigned int id, | 783 | int regmap_fields_write(struct regmap_field *field, unsigned int id, |
784 | unsigned int val); | 784 | unsigned int val); |
785 | int regmap_fields_force_write(struct regmap_field *field, unsigned int id, | 785 | int regmap_fields_force_write(struct regmap_field *field, unsigned int id, |