fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/42512?usp=email )

Change subject: osmo-bts-trx: clean up log messages in response handlers ......................................................................

osmo-bts-trx: clean up log messages in response handlers

Drop the redundant "transceiver" prefix from LOGPPHI() calls - the macro already prepends the PHY instance name.

Change-Id: Iec722198f161621dd00ce3baabb732e1a1d91a37 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 6 insertions(+), 7 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve

diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 56910fd..6445e9d 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -511,13 +511,13 @@ unsigned int tn, ts_type;

if (rsp->status) - LOGPPHI(pinst, DTRX, LOGL_ERROR, "transceiver SETSLOT failed with status %d\n", + LOGPPHI(pinst, DTRX, LOGL_ERROR, "SETSLOT failed with status %d\n", rsp->status);

/* Since message was already validated against CMD we sent, we know format * of params is: "<TN> <TS_TYPE>" */ if (sscanf(rsp->params, "%u %u", &tn, &ts_type) < 2) { - LOGPPHI(pinst, DTRX, LOGL_ERROR, "transceiver SETSLOT unable to parse params\n"); + LOGPPHI(pinst, DTRX, LOGL_ERROR, "Failed to parse SETSLOT response\n"); return -EINVAL; }

@@ -575,10 +575,9 @@ int nominal_power;

if (rsp->status) - LOGPPHI(pinst, DTRX, LOGL_ERROR, "transceiver NOMTXPOWER failed " - "with status %d. If your transceiver doesn't support this " - "command, then please set the nominal transmit power manually " - "through VTY cmd 'nominal-tx-power'.\n", + LOGPPHI(pinst, DTRX, LOGL_ERROR, "NOMTXPOWER failed with status %d. " + "If your transceiver doesn't support this command, then please " + "set the nominal transmit power manually through VTY cmd 'nominal-tx-power'.\n", rsp->status); if (cb) { if (sscanf(rsp->params, "%d", &nominal_power) != 1) { @@ -597,7 +596,7 @@ int power_att;

if (rsp->status) - LOGPPHI(pinst, DTRX, LOGL_ERROR, "transceiver SETPOWER failed with status %d\n", + LOGPPHI(pinst, DTRX, LOGL_ERROR, "SETPOWER failed with status %d\n", rsp->status); if (cb) { if (sscanf(rsp->params, "%d", &power_att) != 1) {