diff options
| author | bui duc phuc <phucduc.bui@gmail.com> | 2026-07-21 17:25:56 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 17:27:36 +0100 |
| commit | cd1c99ff8cf7682bb2ac92973d1da2db01975cf7 (patch) | |
| tree | 0944cf01f3ab7c4329a8efbe0286aef2b9eb7430 | |
| parent | f8e861f73b904c063f1a189c33a270a564fbe49a (diff) | |
| download | linux-next-cd1c99ff8cf7682bb2ac92973d1da2db01975cf7.tar.gz linux-next-cd1c99ff8cf7682bb2ac92973d1da2db01975cf7.zip | |
ASoC: codecs: rt712-sdca-sdw: Simplify regcache error handling in resume
Calling regcache_mark_dirty() on error is redundant as regcache_sync()
retains dirty state on failure, and any write in cache_only mode marks
the cache dirty anyway.
Restore cache_only directly on error for active regmaps and drop the
redundant regcache_mark_dirty() calls. This also removes goto labels
to prepare for guard cleanup.
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260721102600.523199-26-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/rt712-sdca-sdw.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c index ebdf7b308331..e23501ed87a7 100644 --- a/sound/soc/codecs/rt712-sdca-sdw.c +++ b/sound/soc/codecs/rt712-sdca-sdw.c @@ -473,22 +473,20 @@ static int rt712_sdca_dev_resume(struct device *dev) regcache_cache_only(rt712->regmap, false); ret = regcache_sync(rt712->regmap); - if (ret) - goto err_sync; + if (ret) { + regcache_cache_only(rt712->regmap, true); + return ret; + } regcache_cache_only(rt712->mbq_regmap, false); ret = regcache_sync(rt712->mbq_regmap); - if (ret) - goto err_sync; + if (ret) { + regcache_cache_only(rt712->mbq_regmap, true); + regcache_cache_only(rt712->regmap, true); + return ret; + } return 0; - -err_sync: - regcache_cache_only(rt712->regmap, true); - regcache_cache_only(rt712->mbq_regmap, true); - regcache_mark_dirty(rt712->regmap); - regcache_mark_dirty(rt712->mbq_regmap); - return ret; } static const struct dev_pm_ops rt712_sdca_pm = { |