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

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

regmap: merge regmap_update_bits_check() 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() 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 30ed9cb7

drivers/base/regmap/regmap.c

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

EXPORT_SYMBOL_GPL(regmap_write_bits);



/**

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

 *                           register map 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

 *

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

 */

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

			     unsigned int mask, unsigned int val,

			     bool *change)

{

	int ret;



	map->lock(map->lock_arg);

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

	map->unlock(map->lock_arg);

	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits_check);



/**

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

 *                                 register map asynchronously and report if

include/linux/regmap.h

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

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

	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)



#ifdef CONFIG_REGMAP
@@ -701,9 +703,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(struct regmap *map, unsigned int reg,

			     unsigned int mask, unsigned int val,

			     bool *change);

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

				   unsigned int mask, unsigned int val,

				   bool *change);
@@ -956,15 +955,6 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_update_bits_check(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_update_bits_check_async(struct regmap *map,

						 unsigned int reg,

						 unsigned int mask,