diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
| commit | d083f580e5b940834a93ab741cdf064f0324dc0f (patch) | |
| tree | d034075e47d68179d2f8bf7220d26bef0ba740d3 /lib/average.c | |
| parent | 931f27c6e892fdfe98896055e0df7962e21969d9 (diff) | |
| parent | 13ff50c85846338bb9820abd3933227b678dc086 (diff) | |
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API
This is useful for generic code built on top of regmap dealing with
blocks of data.
Diffstat (limited to 'lib/average.c')
| -rw-r--r-- | lib/average.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/average.c b/lib/average.c index 99a67e662b3c..114d1beae0c7 100644 --- a/lib/average.c +++ b/lib/average.c @@ -53,8 +53,10 @@ EXPORT_SYMBOL(ewma_init); */ struct ewma *ewma_add(struct ewma *avg, unsigned long val) { - avg->internal = avg->internal ? - (((avg->internal << avg->weight) - avg->internal) + + unsigned long internal = ACCESS_ONCE(avg->internal); + + ACCESS_ONCE(avg->internal) = internal ? + (((internal << avg->weight) - internal) + (val << avg->factor)) >> avg->weight : (val << avg->factor); return avg; |