diff --git a/drivers/dma/dma_cavs.c b/drivers/dma/dma_cavs.c
index 5804a135bed..96059c376d5 100644
--- a/drivers/dma/dma_cavs.c
+++ b/drivers/dma/dma_cavs.c
@@ -17,7 +17,7 @@
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(dma_cavs)
+LOG_MODULE_REGISTER(dma_cavs);
 
 #define BYTE				(1)
 #define WORD				(2)
diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c
index e843e722c81..15f44ca8b3e 100644
--- a/drivers/dma/dma_nios2_msgdma.c
+++ b/drivers/dma/dma_nios2_msgdma.c
@@ -17,7 +17,7 @@
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(dma_nios2)
+LOG_MODULE_REGISTER(dma_nios2);
 
 /* Device configuration parameters */
 struct nios2_msgdma_dev_cfg {
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index 123c2e14e88..a906e4c7f75 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -19,7 +19,7 @@
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(dma_sam_xdmac)
+LOG_MODULE_REGISTER(dma_sam_xdmac);
 
 #define XDMAC_INT_ERR (XDMAC_CIE_RBIE | XDMAC_CIE_WBIE | XDMAC_CIE_ROIE)
 #define DMA_CHANNELS_NO  XDMACCHID_NUMBER
diff --git a/drivers/dma/dma_stm32f4x.c b/drivers/dma/dma_stm32f4x.c
index e43648e3532..d9cdcc2bea9 100644
--- a/drivers/dma/dma_stm32f4x.c
+++ b/drivers/dma/dma_stm32f4x.c
@@ -17,7 +17,7 @@
 
 #define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(dma_stm32f4x)
+LOG_MODULE_REGISTER(dma_stm32f4x);
 
 #include <clock_control/stm32_clock_control.h>
 
diff --git a/drivers/gpio/gpio_sch.c b/drivers/gpio/gpio_sch.c
index bba93caa0c0..439e900421b 100644
--- a/drivers/gpio/gpio_sch.c
+++ b/drivers/gpio/gpio_sch.c
@@ -19,7 +19,7 @@
 
 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(gpio_sch)
+LOG_MODULE_REGISTER(gpio_sch);
 
 /* Define GPIO_SCH_LEGACY_IO_PORTS_ACCESS
  * inside soc.h if the GPIO controller
diff --git a/drivers/i2c/i2c_atmel_sam3.c b/drivers/i2c/i2c_atmel_sam3.c
index 9e44c2f853b..468b8a7283f 100644
--- a/drivers/i2c/i2c_atmel_sam3.c
+++ b/drivers/i2c/i2c_atmel_sam3.c
@@ -36,7 +36,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_atmel_sam3)
+LOG_MODULE_REGISTER(i2c_atmel_sam3);
 
 #define TWI_IRQ_PDC \
 	(TWI_SR_ENDRX | TWI_SR_ENDTX | TWI_SR_RXBUFF | TWI_SR_TXBUFE)
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index 02f0bb75b79..11f3f07ca73 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -20,7 +20,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_cc32xx)
+LOG_MODULE_REGISTER(i2c_cc32xx);
 
 #include "i2c-priv.h"
 
diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c
index 8d2c055b937..87852f5799f 100644
--- a/drivers/i2c/i2c_gecko.c
+++ b/drivers/i2c/i2c_gecko.c
@@ -14,7 +14,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_gecko)
+LOG_MODULE_REGISTER(i2c_gecko);
 
 #include "i2c-priv.h"
 
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index 9a5278c9c55..34ccf11ead9 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -23,7 +23,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_sam_twi)
+LOG_MODULE_REGISTER(i2c_sam_twi);
 
 #include "i2c-priv.h"
 
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index 33f94335579..9b20ecf7166 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -21,7 +21,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_sam_twihs)
+LOG_MODULE_REGISTER(i2c_sam_twihs);
 
 #include "i2c-priv.h"
 
diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c
index ee16614ba08..21e9948cfa8 100644
--- a/drivers/i2c/slave/eeprom_slave.c
+++ b/drivers/i2c/slave/eeprom_slave.c
@@ -13,7 +13,7 @@
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(i2c_slave)
+LOG_MODULE_REGISTER(i2c_slave);
 
 struct i2c_eeprom_slave_data {
 	struct device *i2c_controller;
diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c
index a0697797428..bc7f81af1d5 100644
--- a/drivers/sensor/bmc150_magn/bmc150_magn.c
+++ b/drivers/sensor/bmc150_magn/bmc150_magn.c
@@ -22,7 +22,7 @@
 #include "bmc150_magn.h"
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
-LOG_MODULE_REGISTER(BMC150_MAGN)
+LOG_MODULE_REGISTER(BMC150_MAGN);
 
 static const struct {
 	int freq;
diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
index 5255a044488..4ea926cb77c 100644
--- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
@@ -11,7 +11,7 @@
 
 #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(qdec_nrfx)
+LOG_MODULE_REGISTER(qdec_nrfx);
 
 
 #define FULL_ANGLE 360
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index 9f79149b713..a35d1aa02e7 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -11,7 +11,7 @@
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(wdt_mcux_wdog)
+LOG_MODULE_REGISTER(wdt_mcux_wdog);
 
 #define MIN_TIMEOUT 4
 
diff --git a/samples/bluetooth/ipsp/src/main.c b/samples/bluetooth/ipsp/src/main.c
index 308348c3e28..63cd8d824c8 100644
--- a/samples/bluetooth/ipsp/src/main.c
+++ b/samples/bluetooth/ipsp/src/main.c
@@ -8,6 +8,12 @@
 
 #include <logging/log.h>
 
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+LOG_MODULE_REGISTER(ipsp);
+
+/* Preventing log module registration in net_core.h */
+#define NET_LOG_ENABLED	0
+
 #include <zephyr.h>
 #include <linker/sections.h>
 #include <errno.h>
@@ -19,9 +25,6 @@
 #include <net/net_context.h>
 #include <net/udp.h>
 
-#define LOG_MODULE_NAME ipsp
-LOG_MODULE_REGISTER(LOG_MODULE_NAME);
-
 /* admin-local, dynamically allocated multicast address */
 #define MCAST_IP6ADDR { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, \
 			    0, 0, 0, 0, 0, 0, 0, 0x1 } } }
diff --git a/samples/drivers/led_lp3943/src/main.c b/samples/drivers/led_lp3943/src/main.c
index 70380db234e..c957d1f47c9 100644
--- a/samples/drivers/led_lp3943/src/main.c
+++ b/samples/drivers/led_lp3943/src/main.c
@@ -12,7 +12,7 @@
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(log)
+LOG_MODULE_REGISTER(log);
 
 #define LED_DEV_NAME CONFIG_LP3943_DEV_NAME
 #define NUM_LEDS 16
diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c
index 62eefa0eea0..1cf0f875584 100644
--- a/samples/net/wpanusb/src/wpanusb.c
+++ b/samples/net/wpanusb/src/wpanusb.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(wpanusb)
+LOG_MODULE_REGISTER(wpanusb);
 
 #include <net_private.h>
 
diff --git a/samples/subsys/usb/hid/src/main.c b/samples/subsys/usb/hid/src/main.c
index bf62da27994..4be044e1607 100644
--- a/samples/subsys/usb/hid/src/main.c
+++ b/samples/subsys/usb/hid/src/main.c
@@ -11,7 +11,7 @@
 #include <usb/class/usb_hid.h>
 
 #define LOG_LEVEL LOG_LEVEL_DBG
-LOG_MODULE_REGISTER(main)
+LOG_MODULE_REGISTER(main);
 
 #define REPORT_ID_1	0x01
 #define REPORT_ID_2	0x02
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 427826f58a2..d4d3cadb01d 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -156,8 +156,6 @@ void bt_l2cap_chan_remove(struct bt_conn *conn, struct bt_l2cap_chan *ch)
 	}
 }
 
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-#if defined(CONFIG_BT_DEBUG_L2CAP)
 const char *bt_l2cap_chan_state_str(bt_l2cap_chan_state_t state)
 {
 	switch (state) {
@@ -176,6 +174,8 @@ const char *bt_l2cap_chan_state_str(bt_l2cap_chan_state_t state)
 	}
 }
 
+#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
+#if defined(CONFIG_BT_DEBUG_L2CAP)
 void bt_l2cap_chan_set_state_debug(struct bt_l2cap_chan *chan,
 				   bt_l2cap_chan_state_t state,
 				   const char *func, int line)
diff --git a/subsys/net/ip/Kconfig b/subsys/net/ip/Kconfig
index 13337145083..b2aa9d1e5a7 100644
--- a/subsys/net/ip/Kconfig
+++ b/subsys/net/ip/Kconfig
@@ -508,6 +508,14 @@ config NET_PROMISCUOUS_MODE
 	  device driver supports promiscuous mode. The user application
 	  also needs to read the promiscuous mode data.
 
+if NET_PROMISCUOUS_MODE
+module = NET_PROMISC
+module-dep = NET_LOG
+module-str = Log level for promiscuous mode
+module-help = Enables promiscuous mode to output debug messages.
+source "subsys/net/Kconfig.template.log_config.net"
+endif # NET_PROMISCUOUS_MODE
+
 source "subsys/net/ip/Kconfig.stack"
 
 source "subsys/net/ip/Kconfig.mgmt"
diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c
index b9a1b896bbe..3a4a7abe7b7 100644
--- a/subsys/net/ip/ipv4_autoconf.c
+++ b/subsys/net/ip/ipv4_autoconf.c
@@ -10,7 +10,7 @@
  */
 
 #define LOG_MODULE_NAME net_ipv4_autoconf
-#define NET_LOG_LEVEL CONFIG_NET_IPV4_AUTOCONF_LOG_LEVEL
+#define NET_LOG_LEVEL CONFIG_NET_IPV4_AUTO_LOG_LEVEL
 
 #include "net_private.h"
 #include <errno.h>
diff --git a/subsys/net/lib/http/CMakeLists.txt b/subsys/net/lib/http/CMakeLists.txt
index 8e74190d58a..7d246a0a036 100644
--- a/subsys/net/lib/http/CMakeLists.txt
+++ b/subsys/net/lib/http/CMakeLists.txt
@@ -7,7 +7,7 @@ endif()
 zephyr_library_sources_if_kconfig(http_parser.c)
 zephyr_library_sources_if_kconfig(http_parser_url.c)
 
-zephyr_library_sources(http.c)
+zephyr_library_sources_if_kconfig(http.c)
 
 zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER http_server.c)
 zephyr_library_sources_ifdef(CONFIG_HTTP_CLIENT http_client.c)
diff --git a/subsys/usb/bos.c b/subsys/usb/bos.c
index 76a70183d37..4b49df67582 100644
--- a/subsys/usb/bos.c
+++ b/subsys/usb/bos.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_bos)
+LOG_MODULE_REGISTER(usb_bos);
 
 #include <zephyr.h>
 
diff --git a/subsys/usb/class/bluetooth.c b/subsys/usb/class/bluetooth.c
index 6d3f1c273c9..7b7382d265b 100644
--- a/subsys/usb/class/bluetooth.c
+++ b/subsys/usb/class/bluetooth.c
@@ -21,7 +21,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_bluetooth)
+LOG_MODULE_REGISTER(usb_bluetooth);
 
 #if !defined(CONFIG_USB_COMPOSITE_DEVICE)
 static u8_t interface_data[64];
diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c
index a20065275af..88e72910ee4 100644
--- a/subsys/usb/class/cdc_acm.c
+++ b/subsys/usb/class/cdc_acm.c
@@ -55,7 +55,7 @@
 
 #define LOG_LEVEL CONFIG_USB_CDC_ACM_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_cdc_acm)
+LOG_MODULE_REGISTER(usb_cdc_acm);
 
 #define DEV_DATA(dev)						\
 	((struct cdc_acm_dev_data_t * const)(dev)->driver_data)
diff --git a/subsys/usb/class/hid/core.c b/subsys/usb/class/hid/core.c
index 3f96a032299..e09ebf0aa94 100644
--- a/subsys/usb/class/hid/core.c
+++ b/subsys/usb/class/hid/core.c
@@ -8,7 +8,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_hid)
+LOG_MODULE_REGISTER(usb_hid);
 
 #include <misc/byteorder.h>
 #include <usb_device.h>
diff --git a/subsys/usb/class/loopback.c b/subsys/usb/class/loopback.c
index 56b334f7397..0300c440a05 100644
--- a/subsys/usb/class/loopback.c
+++ b/subsys/usb/class/loopback.c
@@ -15,7 +15,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_loopback)
+LOG_MODULE_REGISTER(usb_loopback);
 
 #define LOOPBACK_OUT_EP_ADDR		0x01
 #define LOOPBACK_IN_EP_ADDR		0x81
diff --git a/subsys/usb/class/mass_storage.c b/subsys/usb/class/mass_storage.c
index 642211faecf..72f9fd5ff2b 100644
--- a/subsys/usb/class/mass_storage.c
+++ b/subsys/usb/class/mass_storage.c
@@ -46,7 +46,7 @@
 
 #define LOG_LEVEL CONFIG_USB_MASS_STORAGE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_msc)
+LOG_MODULE_REGISTER(usb_msc);
 
 /* max USB packet size */
 #define MAX_PACKET	CONFIG_MASS_STORAGE_BULK_EP_MPS
diff --git a/subsys/usb/class/netusb/function_ecm.c b/subsys/usb/class/netusb/function_ecm.c
index 8234b260bb2..e70a8e699fd 100644
--- a/subsys/usb/class/netusb/function_ecm.c
+++ b/subsys/usb/class/netusb/function_ecm.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_DEBUG_LEVEL
+#define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_ecm)
+LOG_MODULE_REGISTER(usb_ecm);
 
 /* Enable verbose debug printing extra hexdumps */
 #define VERBOSE_DEBUG	0
diff --git a/subsys/usb/class/netusb/function_eem.c b/subsys/usb/class/netusb/function_eem.c
index c5e5a32b2cb..7c51baaec30 100644
--- a/subsys/usb/class/netusb/function_eem.c
+++ b/subsys/usb/class/netusb/function_eem.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_DEBUG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_eem)
+LOG_MODULE_REGISTER(usb_eem);
 
 #include <net_private.h>
 #include <zephyr.h>
diff --git a/subsys/usb/class/netusb/function_rndis.c b/subsys/usb/class/netusb/function_rndis.c
index ac65e7701fb..74a1d11907d 100644
--- a/subsys/usb/class/netusb/function_rndis.c
+++ b/subsys/usb/class/netusb/function_rndis.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_DEBUG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_rndis)
+LOG_MODULE_REGISTER(usb_rndis);
 
 /* Enable verbose debug printing extra hexdumps */
 #define VERBOSE_DEBUG	0
diff --git a/subsys/usb/class/netusb/netusb.c b/subsys/usb/class/netusb/netusb.c
index 920d874db40..c04b532febf 100644
--- a/subsys/usb/class/netusb/netusb.c
+++ b/subsys/usb/class/netusb/netusb.c
@@ -8,7 +8,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_net)
+LOG_MODULE_REGISTER(usb_net);
 
 /* Enable verbose debug printing extra hexdumps */
 #define VERBOSE_DEBUG	0
diff --git a/subsys/usb/class/usb_dfu.c b/subsys/usb/class/usb_dfu.c
index 4ece87e7863..06d85d27e58 100644
--- a/subsys/usb/class/usb_dfu.c
+++ b/subsys/usb/class/usb_dfu.c
@@ -53,7 +53,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_dfu)
+LOG_MODULE_REGISTER(usb_dfu);
 
 #define NUMOF_ALTERNATE_SETTINGS	2
 
diff --git a/subsys/usb/os_desc.c b/subsys/usb/os_desc.c
index a81ec2a6f90..80d3856a8cd 100644
--- a/subsys/usb/os_desc.c
+++ b/subsys/usb/os_desc.c
@@ -6,7 +6,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_os_desc)
+LOG_MODULE_REGISTER(usb_os_desc);
 
 #include <zephyr.h>
 
diff --git a/subsys/usb/usb_device.c b/subsys/usb/usb_device.c
index 7a128d7c868..039779e1bc7 100644
--- a/subsys/usb/usb_device.c
+++ b/subsys/usb/usb_device.c
@@ -72,7 +72,7 @@
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(usb_device)
+LOG_MODULE_REGISTER(usb_device);
 
 #include <usb/bos.h>
 #include <os_desc.h>