mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
regmap: merge regmap_field_write() into macro
This patch merges regmap_field_write() 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>
This commit is contained in:
parent
28972eaa34
commit
3674124b35
2 changed files with 3 additions and 17 deletions
|
@ -1716,22 +1716,6 @@ int regmap_field_update_bits_base(struct regmap_field *field,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);
|
EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);
|
||||||
|
|
||||||
/**
|
|
||||||
* regmap_field_write(): Write a value to a single register field
|
|
||||||
*
|
|
||||||
* @field: Register field to write to
|
|
||||||
* @val: Value to be written
|
|
||||||
*
|
|
||||||
* A value of zero will be returned on success, a negative errno will
|
|
||||||
* be returned in error cases.
|
|
||||||
*/
|
|
||||||
int regmap_field_write(struct regmap_field *field, unsigned int val)
|
|
||||||
{
|
|
||||||
return regmap_update_bits(field->regmap, field->reg,
|
|
||||||
field->mask, val << field->shift);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(regmap_field_write);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* regmap_field_update_bits(): Perform a read/modify/write cycle
|
* regmap_field_update_bits(): Perform a read/modify/write cycle
|
||||||
* on the register field
|
* on the register field
|
||||||
|
|
|
@ -74,6 +74,9 @@ struct reg_sequence {
|
||||||
#define regmap_update_bits_check_async(map, reg, mask, val, change)\
|
#define regmap_update_bits_check_async(map, reg, mask, val, change)\
|
||||||
regmap_update_bits_base(map, reg, mask, val, change, true, false)
|
regmap_update_bits_base(map, reg, mask, val, change, true, false)
|
||||||
|
|
||||||
|
#define regmap_field_write(field, val) \
|
||||||
|
regmap_field_update_bits_base(field, ~0, val, NULL, false, false)
|
||||||
|
|
||||||
#ifdef CONFIG_REGMAP
|
#ifdef CONFIG_REGMAP
|
||||||
|
|
||||||
enum regmap_endian {
|
enum regmap_endian {
|
||||||
|
@ -772,7 +775,6 @@ struct regmap_field *devm_regmap_field_alloc(struct device *dev,
|
||||||
void devm_regmap_field_free(struct device *dev, struct regmap_field *field);
|
void devm_regmap_field_free(struct device *dev, struct regmap_field *field);
|
||||||
|
|
||||||
int regmap_field_read(struct regmap_field *field, unsigned int *val);
|
int regmap_field_read(struct regmap_field *field, unsigned int *val);
|
||||||
int regmap_field_write(struct regmap_field *field, unsigned int val);
|
|
||||||
int regmap_field_update_bits_base(struct regmap_field *field,
|
int regmap_field_update_bits_base(struct regmap_field *field,
|
||||||
unsigned int mask, unsigned int val,
|
unsigned int mask, unsigned int val,
|
||||||
bool *change, bool async, bool force);
|
bool *change, bool async, bool force);
|
||||||
|
|
Loading…
Reference in a new issue