Partly for coding style reasons, but mostly because sparse warns on it.

This patch is a completion of a previous patch by Mark Brown.
Reviewed-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>