style fix for warnings. 'else' with a single 'return' is usually not
required.
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>