Commit 721ed64d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3674124b

drivers/base/regmap/regmap.c

+0 −20
Original line number Diff line number Diff line
@@ -1716,26 +1716,6 @@ int regmap_field_update_bits_base(struct regmap_field *field, 
}

EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);



/**

 * regmap_field_update_bits():	Perform a read/modify/write cycle

 *                              on the register field

 *

 * @field: Register field to write to

 * @mask: Bitmask to change

 * @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_update_bits(struct regmap_field *field, unsigned int mask, unsigned int val)

{

	mask = (mask << field->shift) & field->mask;



	return regmap_update_bits(field->regmap, field->reg,

				  mask, val << field->shift);

}

EXPORT_SYMBOL_GPL(regmap_field_update_bits);



/**

 * regmap_fields_write(): Write a value to a single register field with port ID

 *

include/linux/regmap.h

+2 −2
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ struct reg_sequence { 


#define	regmap_field_write(field, val) \

	regmap_field_update_bits_base(field, ~0, val, NULL, false, false)

#define	regmap_field_update_bits(field, mask, val)\

	regmap_field_update_bits_base(field, mask, val, NULL, false, false)



#ifdef CONFIG_REGMAP
@@ -778,8 +780,6 @@ int regmap_field_read(struct regmap_field *field, unsigned int *val); 
int regmap_field_update_bits_base(struct regmap_field *field,

				  unsigned int mask, unsigned int val,

				  bool *change, bool async, bool force);

int regmap_field_update_bits(struct regmap_field *field,

			     unsigned int mask, unsigned int val);

int regmap_fields_write(struct regmap_field *field, unsigned int id,

			unsigned int val);

int regmap_fields_force_write(struct regmap_field *field, unsigned int id,