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

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

regmap: merge regmap_update_bits() into macro 



Current regmap has many similar update functions like below,
but the difference is very few.
	regmap_update_bits()
	regmap_update_bits_async()
	regmap_update_bits_check()
	regmap_update_bits_check_async()
Furthermore, we can add *force* write option too in the future.

This patch merges regmap_update_bits() into macro
by using regmap_update_bits_base().

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

drivers/base/regmap/regmap.c

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

EXPORT_SYMBOL_GPL(regmap_update_bits_base);



/**

 * regmap_update_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_update_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, false);

	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits);



/**

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

 *

include/linux/regmap.h

+3 −9
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ struct reg_sequence { 
	unsigned int delay_us;

};



#define	regmap_update_bits(map, reg, mask, val) \

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



#ifdef CONFIG_REGMAP



enum regmap_endian {
@@ -694,8 +697,6 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
int regmap_update_bits_base(struct regmap *map, unsigned int reg,

			    unsigned int mask, unsigned int val,

			    bool *change, bool async, bool force);

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

		       unsigned int mask, unsigned int val);

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

		       unsigned int mask, unsigned int val);

int regmap_update_bits_async(struct regmap *map, unsigned int reg,
@@ -948,13 +949,6 @@ static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



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

				     unsigned int mask, unsigned int val)

{