This also has some coding style fixes.
Signed-off-by: NYuri Funduryan <yurifun@mail.ru>
Signed-off-by: NHartmut Hackmann <hartmut.hackmann@t-online.de>
Reviewed-by: NHermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>