[MERGED] osmo-bts[master]: cosmetic: Move error goto path to the end of the function

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: cosmetic: Move error goto path to the end of the function
......................................................................


cosmetic: Move error goto path to the end of the function

Change-Id: I3ad15a9edbfe74de3deb7298441d54fd9d0178ad
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 9 insertions(+), 8 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 26b1705..967e3db 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -1549,14 +1549,7 @@
 	/* check if transceiver is still alive */
 	if (tcs->fn_without_clock_ind++ == TRX_LOSS_FRAMES) {
 		LOGP(DL1C, LOGL_NOTICE, "No more clock from transceiver\n");
-
-no_clock:
-		timer_ofd_disable(&tcs->fn_timer_ofd);
-		transceiver_available = 0;
-
-		bts_shutdown(bts, "No clock from osmo-trx");
-
-		return -1;
+		goto no_clock;
 	}
 
 	/* compute actual elapsed time and resulting OS scheduling error */
@@ -1583,6 +1576,14 @@
 	}
 
 	return 0;
+
+no_clock:
+	timer_ofd_disable(&tcs->fn_timer_ofd);
+	transceiver_available = 0;
+
+	bts_shutdown(bts, "No clock from osmo-trx");
+
+	return -1;
 }
 
 /*! reset clock with current fn and schedule it. Called when trx becomes

-- 
To view, visit https://gerrit.osmocom.org/3117
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ad15a9edbfe74de3deb7298441d54fd9d0178ad
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>