From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- drivers/base/regmap/regmap.c | 12 ------------ include/linux/regmap.h | 6 ++++-- 2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 9329c27..1b5c6e2 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1754,18 +1754,6 @@ int _regmap_fields_write(struct regmap_field *field, } EXPORT_SYMBOL_GPL(_regmap_fields_write);
-int regmap_fields_force_write(struct regmap_field *field, unsigned int id, - unsigned int val) -{ - if (id >= field->id_size) - return -EINVAL; - - return regmap_write_bits(field->regmap, - field->reg + (field->id_offset * id), - field->mask, val << field->shift); -} -EXPORT_SYMBOL_GPL(regmap_fields_force_write); - /** * _regmap_fields_update_bits(): Perform a read/modify/write cycle * on the register field diff --git a/include/linux/regmap.h b/include/linux/regmap.h index befa781..eebee95 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -85,8 +85,12 @@ struct reg_sequence {
#define regmap_fields_write(field, id, val)\ _regmap_fields_write(field, id, val, NULL, false, false) +#define regmap_fields_force_write(field, id, val) \ + _regmap_fields_write(field, id, val, NULL, false, true) #define regmap_fields_update_bits(field, id, mask, val)\ _regmap_fields_update_bits(field, id, mask, val, NULL, false, false) +#define regmap_fields_force_update_bits(field, id, mask, val) \ + _regmap_fields_update_bits(field, id, mask, val, NULL, false, true)
#ifdef CONFIG_REGMAP
@@ -794,8 +798,6 @@ int _regmap_field_update_bits(struct regmap_field *field, int _regmap_fields_write(struct regmap_field *field, unsigned int id, unsigned int val, bool *change, bool async, bool force); -int regmap_fields_force_write(struct regmap_field *field, unsigned int id, - unsigned int val); int regmap_fields_read(struct regmap_field *field, unsigned int id, unsigned int *val); int _regmap_fields_update_bits(struct regmap_field *field, unsigned int id,