From 704e4b446be33df476b831677e972bb6adee5040 Mon Sep 17 00:00:00 2001
From: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Date: Fri, 18 Jan 2019 15:53:06 +0100
Subject: [PATCH] soc: nrf: clean up inclusions and style fixes

Remove redundant inclusion of nrf.h (included by nrfx.h).
Group the logging/log.h inclusion together with the other
inclusions in this file (make inclusions' list look as in
nrf9160/soc.c).

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
---
 soc/arm/nordic_nrf/nrf51/soc.c | 2 +-
 soc/arm/nordic_nrf/nrf52/soc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
index a5310328d7..804b2d9459 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.c
+++ b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -17,6 +17,7 @@
 #include <init.h>
 #include <nrfx.h>
 #include <soc/nrfx_coredep.h>
+#include <logging/log.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void _NmiInit(void);
@@ -27,7 +28,6 @@ extern void _NmiInit(void);
 
 #include <system_nrf51.h>
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 static int nordicsemi_nrf51_init(struct device *arg)
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
index 4c46dd28a2..e6cf05d944 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.c
+++ b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -17,6 +17,7 @@
 #include <cortex_m/exc.h>
 #include <nrfx.h>
 #include <soc/nrfx_coredep.h>
+#include <logging/log.h>
 
 #ifdef CONFIG_RUNTIME_NMI
 extern void _NmiInit(void);
@@ -35,11 +36,9 @@ extern void _NmiInit(void);
 #error "Unknown SoC."
 #endif
 
-#include <nrf.h>
 #include <hal/nrf_power.h>
 
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
-#include <logging/log.h>
 LOG_MODULE_REGISTER(soc);
 
 static int nordicsemi_nrf52_init(struct device *arg)