mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regmap: merge regmap_update_bits_check() into macro

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto
2016-02-15 05:23:17 +00:00
committed by Mark Brown
parent 30ed9cb7a4
commit 98c2dc4869
2 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/base/regmap/regmap.c
View File

@@ -2710,31 +2710,6 @@ int regmap_write_bits(struct regmap *map, unsigned int reg,
} }
EXPORT_SYMBOL_GPL(regmap_write_bits); 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 * regmap_update_bits_check_async: Perform a read/modify/write cycle on the
* register map asynchronously and report if * register map asynchronously and report if

14
include/linux/regmap.h
View File

@@ -69,6 +69,8 @@ struct reg_sequence {
regmap_update_bits_base(map, reg, mask, val, NULL, false, false) regmap_update_bits_base(map, reg, mask, val, NULL, false, false)
#define regmap_update_bits_async(map, reg, mask, val)\ #define regmap_update_bits_async(map, reg, mask, val)\
regmap_update_bits_base(map, reg, mask, val, NULL, true, false) 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 #ifdef CONFIG_REGMAP
@@ -701,9 +703,6 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg,
bool *change, bool async, bool force); bool *change, bool async, bool force);
int regmap_write_bits(struct regmap *map, unsigned int reg, int regmap_write_bits(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val); 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, int regmap_update_bits_check_async(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val, unsigned int mask, unsigned int val,
bool *change); bool *change);
@@ -956,15 +955,6 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
return -EINVAL; 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, static inline int regmap_update_bits_check_async(struct regmap *map,
unsigned int reg, unsigned int reg,
unsigned int mask, unsigned int mask,