Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

regmap: replace regmap_write_bits() 



commit 23b92e4cf5fd ("regmap: remove regmap_write_bits()")
removed regmap_write_bits(), but MFD driver was using it.
So, commit e30fccd6771d ("regmap: Keep regmap_write_bits()")
turns out it, but it is using original style.
This patch uses regmap_update_bits_base() for regmap_write_bits()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e6ef243f

drivers/base/regmap/regmap.c

+0 −23
Original line number Original line Diff line number Diff line
@@ -2650,29 +2650,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
}

}

EXPORT_SYMBOL_GPL(regmap_update_bits_base);

EXPORT_SYMBOL_GPL(regmap_update_bits_base);





/**

 * regmap_write_bits: Perform a read/modify/write cycle on the register map

 *

 * @map: Register map to update

 * @reg: Register to update

 * @mask: Bitmask to change

 * @val: New value for bitmask

 *

 * Returns zero for success, a negative number on error.

 */

int regmap_write_bits(struct regmap *map, unsigned int reg,

		      unsigned int mask, unsigned int val)

{

	int ret;



	map->lock(map->lock_arg);

	ret = _regmap_update_bits(map, reg, mask, val, NULL, true);

	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_write_bits);



void regmap_async_complete_cb(struct regmap_async *async, int ret)

void regmap_async_complete_cb(struct regmap_async *async, int ret)

{

{

	struct regmap *map = async->map;

	struct regmap *map = async->map;

include/linux/regmap.h

+3 −9
Original line number Original line Diff line number Diff line
@@ -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_write_bits(map, reg, mask, val) \

	regmap_update_bits_base(map, reg, mask, val, NULL, false, true)



#define	regmap_field_write(field, val) \

#define	regmap_field_write(field, val) \

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

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

#define	regmap_field_force_write(field, val) \

#define	regmap_field_force_write(field, val) \
@@ -721,8 +724,6 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
int regmap_update_bits_base(struct regmap *map, unsigned int reg,

int regmap_update_bits_base(struct regmap *map, unsigned int reg,

			    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_write_bits(struct regmap *map, unsigned int reg,

		       unsigned int mask, unsigned int val);

int regmap_get_val_bytes(struct regmap *map);

int regmap_get_val_bytes(struct regmap *map);

int regmap_get_max_register(struct regmap *map);

int regmap_get_max_register(struct regmap *map);

int regmap_get_reg_stride(struct regmap *map);

int regmap_get_reg_stride(struct regmap *map);
@@ -961,13 +962,6 @@ static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
	return -EINVAL;

	return -EINVAL;

}

}





static inline int regmap_write_bits(struct regmap *map, unsigned int reg,

				     unsigned int mask, unsigned int val)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_field_update_bits_base(struct regmap_field *field,

static inline 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)