The patch removes some useless goto in code cleanup.
Signed-off-by: NWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: NZhu Yi <yi.zhu@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>