Remove goto statements that do nothing else than jump to the next line
of code.
Signed-off-by: NSyam Sidhardhan <s.syam@samsung.com>
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>