diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-17 21:33:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-18 15:05:12 +0100 |
| commit | 99aae70551f99536936438bbcfc562df69eeb79c (patch) | |
| tree | 75ab82aa72fd2070b4b1f993196caf89734764d5 /sound | |
| parent | d881ee5a872fd539a8c693e4c8656b9343c9aae0 (diff) | |
| download | linux-stable-99aae70551f99536936438bbcfc562df69eeb79c.tar.gz linux-stable-99aae70551f99536936438bbcfc562df69eeb79c.tar.bz2 linux-stable-99aae70551f99536936438bbcfc562df69eeb79c.zip | |
ALSA: hda: Use regcache_reg_cached() rather than open coding
The HDA driver intentionally drops repeated writes to registers in some
circumstances, beyond the suppression of noop writes that regmap does in
regmap_update_bits(). It does this by checking if the register is cached
before doing a regmap_update_bits(), now we have an API for querying this
directly use it directly rather than trying a read in cache only mode
making the code a little clearer.
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230717-regmap-cache-check-v1-3-73ef688afae3@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_regmap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index 9b1bcabd8414..97cee096a286 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -556,17 +556,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw); static int reg_raw_update_once(struct hdac_device *codec, unsigned int reg, unsigned int mask, unsigned int val) { - unsigned int orig; - int err; + int err = 0; if (!codec->regmap) return reg_raw_update(codec, reg, mask, val); mutex_lock(&codec->regmap_lock); - regcache_cache_only(codec->regmap, true); - err = regmap_read(codec->regmap, reg, &orig); - regcache_cache_only(codec->regmap, false); - if (err < 0) + /* Discard any updates to already initialised registers. */ + if (!regcache_reg_cached(codec->regmap, reg)) err = regmap_update_bits(codec->regmap, reg, mask, val); mutex_unlock(&codec->regmap_lock); return err; |