From 5037b6817f9d847c376765d7f10f0f76fae9453a Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Mon, 18 Jan 2021 13:55:51 +0100
Subject: gb_proxy: Don't use orphan log subsystem DPCU

DPCU is defined in debug.h, but never registered as log subsystem,
so we shall not use it.  Also remove other similar "orphan" log
subsystems from debug.h

Change-Id: I8be54ee49e10d4004128352613923c4700063aa3
---
 include/osmocom/sgsn/debug.h | 13 -------------
 src/gbproxy/gb_proxy.c       | 10 +++++-----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h
index da819d562..9a686cb68 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -8,34 +8,21 @@
 
 /* Debug Areas of the code */
 enum {
-	DRLL,
-	DCC,
 	DMM,
-	DRR,
-	DRSL,
-	DNM,
-	DMNCC,
 	DPAG,
 	DMEAS,
-	DSCCP,
-	DMSC,
-	DHO,
-	DDB,
 	DREF,
 	DGPRS,
 	DNS,
 	DLLC,
 	DSNDCP,
 	DSLHC,
-	DNAT,
 	DCTRL,
 	DFILTER,
 	DGTPHUB,
 	DRANAP,
 	DSUA,
 	DV42BIS,
-	DPCU,
-	DVLR,
 	DIUCS,
 	DSIGTRAN,
 	DGTP,
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 1ce271683..d88b89ba8 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -1309,7 +1309,7 @@ void gprs_ns_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_pri
 		break;
 
 	case NS_AFF_CAUSE_RECOVERY:
-		LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);
+		LOGP(DGPRS, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);
 		sgsn_nse = gbproxy_nse_by_nsei(cfg, nsp->nsei, NSE_F_SGSN);
 		if (sgsn_nse) {
 			uint8_t cause = BSSGP_CAUSE_OML_INTERV;
@@ -1343,10 +1343,10 @@ void gprs_ns_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_pri
 			}
 		}
 #endif
-		LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei);
+		LOGP(DGPRS, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei);
 		break;
 	default:
-		LOGP(DPCU, LOGL_NOTICE, "NS: Unknown NS-STATUS.ind cause=%s from NS\n",
+		LOGP(DGPRS, LOGL_NOTICE, "NS: Unknown NS-STATUS.ind cause=%s from NS\n",
 		     gprs_ns2_aff_cause_prim_str(nsp->u.status.cause));
 		break;
 	}
@@ -1366,7 +1366,7 @@ int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
 	nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph);
 
 	if (oph->operation != PRIM_OP_INDICATION) {
-		LOGP(DPCU, LOGL_NOTICE, "NS: Unexpected primitive operation %s from NS\n",
+		LOGP(DGPRS, LOGL_NOTICE, "NS: Unexpected primitive operation %s from NS\n",
 		     get_value_string(osmo_prim_op_names, oph->operation));
 		return 0;
 	}
@@ -1388,7 +1388,7 @@ int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
 		gprs_ns_prim_status_cb(cfg, nsp);
 		break;
 	default:
-		LOGP(DPCU, LOGL_NOTICE, "NS: Unknown prim %s %s from NS\n",
+		LOGP(DGPRS, LOGL_NOTICE, "NS: Unknown prim %s %s from NS\n",
 		     gprs_ns2_prim_str(oph->primitive),
 		     get_value_string(osmo_prim_op_names, oph->operation));
 		break;
-- 
cgit v1.2.3