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

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

regmap: merge regmap_update_bits_check_async() 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_check_async() 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 98c2dc48

drivers/base/regmap/regmap.c

+0 −37
Original line number Diff line number Diff line
@@ -2710,43 +2710,6 @@ int regmap_write_bits(struct regmap *map, unsigned int reg, 
}

EXPORT_SYMBOL_GPL(regmap_write_bits);



/**

 * regmap_update_bits_check_async: Perform a read/modify/write cycle on the

 *                                 register map asynchronously and report if

 *                                 updated

 *

 * @map: Register map to update

 * @reg: Register to update

 * @mask: Bitmask to change

 * @val: New value for bitmask

 * @change: Boolean indicating if a write was done

 *

 * With most buses the read must be done synchronously so this is most

 * useful for devices with a cache which do not need to interact with

 * the hardware to determine the current register value.

 *

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

 */

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

				   unsigned int mask, unsigned int val,

				   bool *change)

{

	int ret;



	map->lock(map->lock_arg);



	map->async = true;



	ret = _regmap_update_bits(map, reg, mask, val, change, false);



	map->async = false;



	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits_check_async);



void regmap_async_complete_cb(struct regmap_async *async, int ret)

{

	struct regmap *map = async->map;

include/linux/regmap.h

+2 −13
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ struct reg_sequence { 
	regmap_update_bits_base(map, reg, mask, val, NULL, true, false)

#define	regmap_update_bits_check(map, reg, mask, val, change)\

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

#define	regmap_update_bits_check_async(map, reg, mask, val, change)\

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



#ifdef CONFIG_REGMAP
@@ -703,9 +705,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
			    bool *change, bool async, bool force);

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

		       unsigned int mask, unsigned int val);

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

				   unsigned int mask, unsigned int val,

				   bool *change);

int regmap_get_val_bytes(struct regmap *map);

int regmap_get_max_register(struct regmap *map);

int regmap_get_reg_stride(struct regmap *map);
@@ -955,16 +954,6 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_update_bits_check_async(struct regmap *map,

						 unsigned int reg,

						 unsigned int mask,

						 unsigned int val,

						 bool *change)

{

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

	return -EINVAL;

}



static inline int regmap_get_val_bytes(struct regmap *map)

{

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