From 804a6642fb5026a5b6199efcb19a12229b37a15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kopy=C5=9Bci=C5=84ski?=
 <krzysztof.kopyscinski@codecoup.pl>
Date: Fri, 22 Oct 2021 07:53:59 +0200
Subject: [PATCH] host/mesh: cleanup log modules

---
 nimble/host/mesh/src/adv_ext.c    | 1 -
 nimble/host/mesh/src/adv_legacy.c | 1 -
 nimble/host/mesh/src/cdb.c        | 3 +--
 nimble/host/mesh/src/msg.c        | 3 ---
 nimble/host/mesh/src/proxy_srv.c  | 3 +--
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/nimble/host/mesh/src/adv_ext.c b/nimble/host/mesh/src/adv_ext.c
index 364fb249b..a531863f7 100644
--- a/nimble/host/mesh/src/adv_ext.c
+++ b/nimble/host/mesh/src/adv_ext.c
@@ -8,7 +8,6 @@
  */
 
 #define MESH_LOG_MODULE BLE_MESH_ADV_LOG
-#define LOG_MODULE_NAME bt_mesh_adv_ext
 
 
 #include "adv.h"
diff --git a/nimble/host/mesh/src/adv_legacy.c b/nimble/host/mesh/src/adv_legacy.c
index 9506c08ba..eed3456dd 100644
--- a/nimble/host/mesh/src/adv_legacy.c
+++ b/nimble/host/mesh/src/adv_legacy.c
@@ -8,7 +8,6 @@
  */
 
 #define MESH_LOG_MODULE BLE_MESH_ADV_LOG
-#define LOG_MODULE_NAME bt_mesh_adv_legacy
 
 #include "adv.h"
 #include "net.h"
diff --git a/nimble/host/mesh/src/cdb.c b/nimble/host/mesh/src/cdb.c
index 5c7f88d47..f92ece609 100644
--- a/nimble/host/mesh/src/cdb.c
+++ b/nimble/host/mesh/src/cdb.c
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define BT_DBG_ENABLED MYNEWT_VAL(BLE_MESH_DEBUG_CDB)
-#define LOG_MODULE_NAME bt_mesh_cdb
+#define MESH_LOG_MODULE BLE_MESH_LOG
 #include "log/log.h"
 #include <stdlib.h>
 
diff --git a/nimble/host/mesh/src/msg.c b/nimble/host/mesh/src/msg.c
index 230a2ab43..f75082cb9 100644
--- a/nimble/host/mesh/src/msg.c
+++ b/nimble/host/mesh/src/msg.c
@@ -8,9 +8,6 @@
 
 #include "mesh/mesh.h"
 
-#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ACCESS)
-#define LOG_MODULE_NAME bt_mesh_msg
-
 void bt_mesh_model_msg_init(struct os_mbuf *msg, uint32_t opcode)
 {
 	net_buf_simple_init(msg, 0);
diff --git a/nimble/host/mesh/src/proxy_srv.c b/nimble/host/mesh/src/proxy_srv.c
index b60cf3d64..e0883a67e 100644
--- a/nimble/host/mesh/src/proxy_srv.c
+++ b/nimble/host/mesh/src/proxy_srv.c
@@ -7,8 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define BT_DBG_ENABLED CONFIG_BT_MESH_DEBUG_PROXY
-#define LOG_MODULE_NAME bt_mesh_gatt
+#define MESH_LOG_MODULE BLE_MESH_PROXY_LOG
 
 #include "../../host/src/ble_hs_priv.h"
 #include "services/gatt/ble_svc_gatt.h"