This is just a code shuffle without functional changes. For easier
review of later changes, i.e. preparation.
Signed-off-by: NJiri Slaby <jslaby@suse.cz>
Acked-by: NAntti Palosaari <crope@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>