From 8920cf127a3f3403fdc3a74f1575decd4bfb1266 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Thu, 31 Aug 2017 11:02:47 -0400
Subject: [PATCH] cleanup: Move #include directives

Move all #include directives at the very top of the file, before any
code.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 arch/arc/core/irq_manage.c    |  2 +-
 drivers/gpio/gpio_pcal9535a.c | 15 ++-------------
 kernel/init.c                 |  2 +-
 kernel/sys_clock.c            |  2 --
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/arch/arc/core/irq_manage.c b/arch/arc/core/irq_manage.c
index 4b4505f1e1d..d01c0abb830 100644
--- a/arch/arc/core/irq_manage.c
+++ b/arch/arc/core/irq_manage.c
@@ -24,6 +24,7 @@
 #include <linker/sections.h>
 #include <sw_isr_table.h>
 #include <irq.h>
+#include <misc/printk.h>
 
 /*
  * @brief Enable an interrupt line
@@ -95,7 +96,6 @@ void _irq_priority_set(unsigned int irq, unsigned int prio, u32_t flags)
  * @return N/A
  */
 
-#include <misc/printk.h>
 void _irq_spurious(void *unused)
 {
 	ARG_UNUSED(unused);
diff --git a/drivers/gpio/gpio_pcal9535a.c b/drivers/gpio/gpio_pcal9535a.c
index 676300353b1..98ba0c8125c 100644
--- a/drivers/gpio/gpio_pcal9535a.c
+++ b/drivers/gpio/gpio_pcal9535a.c
@@ -11,7 +11,8 @@
 #include <errno.h>
 
 #include <kernel.h>
-
+#include <device.h>
+#include <init.h>
 #include <misc/util.h>
 #include <gpio.h>
 #include <i2c.h>
@@ -554,9 +555,6 @@ static int gpio_pcal9535a_init(struct device *dev)
 
 /* Initialization for PCAL9535A_0 */
 #ifdef CONFIG_GPIO_PCAL9535A_0
-#include <device.h>
-#include <init.h>
-
 static const struct gpio_pcal9535a_config gpio_pcal9535a_0_cfg = {
 	.i2c_master_dev_name = CONFIG_GPIO_PCAL9535A_0_I2C_MASTER_DEV_NAME,
 	.i2c_slave_addr = CONFIG_GPIO_PCAL9535A_0_I2C_ADDR,
@@ -581,9 +579,6 @@ DEVICE_INIT(gpio_pcal9535a_0, CONFIG_GPIO_PCAL9535A_0_DEV_NAME,
 
 /* Initialization for PCAL9535A_1 */
 #ifdef CONFIG_GPIO_PCAL9535A_1
-#include <device.h>
-#include <init.h>
-
 static const struct gpio_pcal9535a_config gpio_pcal9535a_1_cfg = {
 	.i2c_master_dev_name = CONFIG_GPIO_PCAL9535A_1_I2C_MASTER_DEV_NAME,
 	.i2c_slave_addr = CONFIG_GPIO_PCAL9535A_1_I2C_ADDR,
@@ -608,9 +603,6 @@ DEVICE_INIT(gpio_pcal9535a_1, CONFIG_GPIO_PCAL9535A_1_DEV_NAME,
 
 /* Initialization for PCAL9535A_2 */
 #ifdef CONFIG_GPIO_PCAL9535A_2
-#include <device.h>
-#include <init.h>
-
 static const struct gpio_pcal9535a_config gpio_pcal9535a_2_cfg = {
 	.i2c_master_dev_name = CONFIG_GPIO_PCAL9535A_2_I2C_MASTER_DEV_NAME,
 	.i2c_slave_addr = CONFIG_GPIO_PCAL9535A_2_I2C_ADDR,
@@ -635,9 +627,6 @@ DEVICE_INIT(gpio_pcal9535a_2, CONFIG_GPIO_PCAL9535A_2_DEV_NAME,
 
 /* Initialization for PCAL9535A_3 */
 #ifdef CONFIG_GPIO_PCAL9535A_3
-#include <device.h>
-#include <init.h>
-
 static const struct gpio_pcal9535a_config gpio_pcal9535a_3_cfg = {
 	.i2c_master_dev_name = CONFIG_GPIO_PCAL9535A_3_I2C_MASTER_DEV_NAME,
 	.i2c_slave_addr = CONFIG_GPIO_PCAL9535A_3_I2C_ADDR,
diff --git a/kernel/init.c b/kernel/init.c
index 0461e7858e8..036524e8c94 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -26,6 +26,7 @@
 #include <ksched.h>
 #include <version.h>
 #include <string.h>
+#include <misc/dlist.h>
 
 /* kernel build timestamp items */
 
@@ -111,7 +112,6 @@ k_tid_t const _idle_thread = (k_tid_t)&_idle_thread_s;
 K_THREAD_STACK_DEFINE(_interrupt_stack, CONFIG_ISR_STACK_SIZE);
 
 #ifdef CONFIG_SYS_CLOCK_EXISTS
-	#include <misc/dlist.h>
 	#define initialize_timeouts() do { \
 		sys_dlist_init(&_timeout_q); \
 	} while ((0))
diff --git a/kernel/sys_clock.c b/kernel/sys_clock.c
index e07674fb4f4..f459f70267b 100644
--- a/kernel/sys_clock.c
+++ b/kernel/sys_clock.c
@@ -203,8 +203,6 @@ u32_t k_uptime_delta_32(s64_t *reftime)
 /* handle the expired timeouts in the nano timeout queue */
 
 #ifdef CONFIG_SYS_CLOCK_EXISTS
-#include <wait_q.h>
-
 /*
  * Handle timeouts by dequeuing the expired ones from _timeout_q and queue
  * them on a local one, then doing the real handling from that queue. This