Shuffle the code around a bit, but without any functional change.

Signed-off-by: Marek Vasut <marex@denx.de>