Simplify the cleanup code.
Signed-off-by: NAxel Lin <axel.lin@ingics.com>
Reviewed-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NMark Brown <broonie@linaro.org>