Some code had pointless gotos that just didn't make any sense.  They didn't
make the code smaller, or faster, or easier to understand.
Signed-off-by: NTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: NAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>