From cd46adb91544acb42b0339028b23a152af019b5a Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 10 Oct 2018 16:26:00 +0200 Subject: handover_decision_2.c: drop redundant debug_candidate() args No functional change. Change-Id: Ida186946f40d30f4d9ed94d9c1ff9bdb70048626 --- src/osmo-bsc/handover_decision_2.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index 67ba26dd7..64fc2ddc0 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -700,9 +700,11 @@ static int trigger_handover_or_assignment(struct gsm_lchan *lchan, struct gsm_bt } /* verbosely log about a handover candidate */ -static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate *candidate, - struct gsm_bts *neighbor, int8_t rxlev, int tchf_count, int tchh_count) +static inline void debug_candidate(struct ho_candidate *candidate, + int8_t rxlev, int tchf_count, int tchh_count) { + struct gsm_lchan *lchan = candidate->lchan; + #define HO_CANDIDATE_FMT(tchx, TCHX) "TCH/" #TCHX "={free %d (want %d), [%s%s%s]%s}" #define HO_CANDIDATE_ARGS(tchx, TCHX) \ tch##tchx##_count, ho_get_hodec2_tch##tchx##_min_slots(candidate->bts->ho), \ @@ -718,18 +720,18 @@ static inline void debug_candidate(struct gsm_lchan *lchan, struct ho_candidate /* now has to be candidate->requirements & REQUIREMENT_C_TCHX != 0: */ \ " less-or-equal congestion")) - if (neighbor) - LOGPHOLCHANTOBTS(lchan, neighbor, LOGL_DEBUG, - "RX level %d -> %d; " - HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", - rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), - HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); - else - LOGPHOLCHANTOBTS(lchan, lchan->ts->trx->bts, LOGL_DEBUG, + if (candidate->bts == lchan->ts->trx->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, "RX level %d; " HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", rxlev2dbm(candidate->avg), HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); + else if (candidate->bts) + LOGPHOLCHANTOBTS(lchan, candidate->bts, LOGL_DEBUG, + "RX level %d -> %d; " + HO_CANDIDATE_FMT(f, F) "; " HO_CANDIDATE_FMT(h, H) "\n", + rxlev2dbm(rxlev), rxlev2dbm(candidate->avg), + HO_CANDIDATE_ARGS(f, F), HO_CANDIDATE_ARGS(h, H)); } /* add candidate for re-assignment within the current cell */ @@ -748,7 +750,7 @@ static void collect_assignment_candidate(struct gsm_lchan *lchan, struct ho_cand c->bts = bts; c->requirements = check_requirements(lchan, bts, tchf_count, tchh_count); c->avg = av_rxlev; - debug_candidate(lchan, c, NULL, 0, tchf_count, tchh_count); + debug_candidate(c, 0, tchf_count, tchh_count); (*candidates)++; } @@ -844,7 +846,7 @@ static void collect_handover_candidate(struct gsm_lchan *lchan, struct neigh_mea tchh_count = bts_count_free_ts(neighbor_bts, GSM_PCHAN_TCH_H); c.requirements = check_requirements(lchan, neighbor_bts, tchf_count, tchh_count); - debug_candidate(lchan, &c, neighbor_bts, av_rxlev, tchf_count, tchh_count); + debug_candidate(&c, av_rxlev, tchf_count, tchh_count); clist[*candidates] = c; (*candidates)++; -- cgit v1.2.3