Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be951017 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65d17a9c

sound/soc/codecs/wm_adsp.c

+1 −7
Original line number Diff line number Diff line
@@ -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++;

	}