It also contains a minor style cleanup.
Signed-off-by: NDenis Carikli <denis@eukrea.com>
Signed-off-by: NMark Brown <broonie@linaro.org>