A few things that need tidying up, no functional changes.
Reviewed-by: NYakir Yang <ykk@rock-chips.com>
Signed-off-by: NSean Paul <seanpaul@chromium.org>