Also merge down a couple of last minute style changes that got lost in the
shuffle.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>