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

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

drivers/base/regmap/regmap.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -1748,28 +1748,6 @@ int regmap_fields_update_bits_base(struct regmap_field *field, unsigned int id, 
}

}

EXPORT_SYMBOL_GPL(regmap_fields_update_bits_base);

EXPORT_SYMBOL_GPL(regmap_fields_update_bits_base);





/**

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

 *

 * @field: Register field to write to

 * @id: port ID

 * @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_fields_write(struct regmap_field *field, unsigned int id,

			unsigned int val)

{

	if (id >= field->id_size)

		return -EINVAL;



	return regmap_update_bits(field->regmap,

				  field->reg + (field->id_offset * id),

				  field->mask, val << field->shift);

}

EXPORT_SYMBOL_GPL(regmap_fields_write);



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

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

			unsigned int val)

			unsigned int val)

{

{

include/linux/regmap.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -79,6 +79,9 @@ struct reg_sequence { 
#define	regmap_field_update_bits(field, mask, val)\

#define	regmap_field_update_bits(field, mask, val)\

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

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





#define	regmap_fields_write(field, id, val) \

	regmap_fields_update_bits_base(field, id, ~0, val, NULL, false, false)



#ifdef CONFIG_REGMAP

#ifdef CONFIG_REGMAP





enum regmap_endian {

enum regmap_endian {
@@ -780,8 +783,6 @@ int regmap_field_read(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);

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,

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

			unsigned int val);

			unsigned int val);

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

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