The previous code were a little bit messy. Cleans it up.
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>