Merge series from Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>:

Few cleanups (safer code), built tested.  Last two patches should
probably be tested.