1fa6dedb82
In preparation for further refactorings. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>