The following samsung branches are based on these cleanups,
which are already in mainline before this branch gets pulled.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>