diff options
| author | Charles Keepax | 2015-02-16 16:25:49 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-02-21 10:35:19 +0100 |
| commit | be951017453cba2f3eb789413f697b8f14393eec (patch) | |
| tree | 8439440897dc80c85a84d3da90e0b4c406d35b46 /sound/soc/codecs | |
| parent | ASoC: wm_adsp: Ensure DSP controls are always persistent (diff) | |
| download | kernel-qcow2-linux-be951017453cba2f3eb789413f697b8f14393eec.tar.gz kernel-qcow2-linux-be951017453cba2f3eb789413f697b8f14393eec.tar.xz kernel-qcow2-linux-be951017453cba2f3eb789413f697b8f14393eec.zip | |
ASoC: wm_adsp: Improve round to next 4-byte boundary
Whilst the existing code does correctly round to the next 4-byte boundary
it does so rather inefficiently. This patch changes the rounding to be
simpler and more efficient.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm_adsp.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 14414ea23b55..e625cedb0fa9 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1184,7 +1184,6 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) int ret, pos, blocks, type, offset, reg; char *file; struct wm_adsp_buf *buf; - int tmp; file = kzalloc(PAGE_SIZE, GFP_KERNEL); if (file == NULL) @@ -1334,12 +1333,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) } } - tmp = le32_to_cpu(blk->len) % 4; - if (tmp) - pos += le32_to_cpu(blk->len) + (4 - tmp) + sizeof(*blk); - else - pos += le32_to_cpu(blk->len) + sizeof(*blk); - + pos += (le32_to_cpu(blk->len) + sizeof(*blk) + 3) & ~0x03; blocks++; } |