[PATCH] hvc_console: Rearrange code