summaryrefslogtreecommitdiff
path: root/zephyr
diff options
context:
space:
mode:
authorAaron Massey <aaronmassey@google.com>2022-09-09 10:47:24 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-12 17:13:53 +0000
commit758c32cb93264f371a945efe5a2d036851202af5 (patch)
tree5d3107c5bcc010ea5639bad4baac4371a953653c /zephyr
parent443ff441a754444f017b5fa509a4277909d60454 (diff)
downloadchrome-ec-758c32cb93264f371a945efe5a2d036851202af5.tar.gz
zephyr: Remove duplicate kernel.h include
The zephyr.h include was replaced with kernel.h in many locations to quickly unblock downstreaming. However, some of these files included both zephyr.h and kernel.h, and now have a duplicate include of kernel.h. Remove duplicate includes of kernel.h BRANCH=none BUG=none TEST=zmake build -a TEST=twister -T zephyr/test -b Signed-off-by: Aaron Massey <aaronmassey@google.com> Change-Id: I20874243f92d368d4da0fa6b84c0f76025408953 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3887958 Reviewed-by: Al Semjonovs <asemjonovs@google.com> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/app/ec/ec_app_main.c1
-rw-r--r--zephyr/shim/chip/it8xxx2/clock.c1
-rw-r--r--zephyr/shim/chip/mchp/clock.c1
-rw-r--r--zephyr/shim/chip/npcx/clock.c1
-rw-r--r--zephyr/shim/include/zephyr_hooks_shim.h1
-rw-r--r--zephyr/shim/src/console_buffer.c1
-rw-r--r--zephyr/shim/src/espi.c1
-rw-r--r--zephyr/shim/src/hooks.c1
-rw-r--r--zephyr/shim/src/hwtimer.c1
-rw-r--r--zephyr/shim/src/rtc.c1
-rw-r--r--zephyr/test/drivers/default/src/usb_mux.c1
11 files changed, 0 insertions, 11 deletions
diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c
index 2e25d9aaca..3d2c42d34f 100644
--- a/zephyr/app/ec/ec_app_main.c
+++ b/zephyr/app/ec/ec_app_main.c
@@ -6,7 +6,6 @@
#include <zephyr/kernel.h>
#include <zephyr/sys/printk.h>
#include <zephyr/shell/shell_uart.h>
-#include <zephyr/kernel.h>
#include "ap_power/ap_pwrseq.h"
#include "button.h"
diff --git a/zephyr/shim/chip/it8xxx2/clock.c b/zephyr/shim/chip/it8xxx2/clock.c
index 5cc312b606..42c07f618f 100644
--- a/zephyr/shim/chip/it8xxx2/clock.c
+++ b/zephyr/shim/chip/it8xxx2/clock.c
@@ -8,7 +8,6 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <zephyr/kernel.h>
#include <soc/ite_it8xxx2/reg_def_cros.h>
#include <zephyr/sys/util.h>
diff --git a/zephyr/shim/chip/mchp/clock.c b/zephyr/shim/chip/mchp/clock.c
index b6bc63366a..1d840854a4 100644
--- a/zephyr/shim/chip/mchp/clock.c
+++ b/zephyr/shim/chip/mchp/clock.c
@@ -9,7 +9,6 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <zephyr/kernel.h>
#include "clock_chip.h"
#include "module_id.h"
diff --git a/zephyr/shim/chip/npcx/clock.c b/zephyr/shim/chip/npcx/clock.c
index ee092fdf9a..495124a1a5 100644
--- a/zephyr/shim/chip/npcx/clock.c
+++ b/zephyr/shim/chip/npcx/clock.c
@@ -9,7 +9,6 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <soc.h>
-#include <zephyr/kernel.h>
#include "clock_chip.h"
#include "module_id.h"
diff --git a/zephyr/shim/include/zephyr_hooks_shim.h b/zephyr/shim/include/zephyr_hooks_shim.h
index ce0a1753aa..5b72530c88 100644
--- a/zephyr/shim/include/zephyr_hooks_shim.h
+++ b/zephyr/shim/include/zephyr_hooks_shim.h
@@ -10,7 +10,6 @@
#include <zephyr/init.h>
#include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
#include "common.h"
#include "cros_version.h"
diff --git a/zephyr/shim/src/console_buffer.c b/zephyr/shim/src/console_buffer.c
index d188fe9553..7b31c70853 100644
--- a/zephyr/shim/src/console_buffer.c
+++ b/zephyr/shim/src/console_buffer.c
@@ -4,7 +4,6 @@
*/
#include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
#include "common.h"
#include "console.h"
diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c
index 69e5dc1a41..89d2391501 100644
--- a/zephyr/shim/src/espi.c
+++ b/zephyr/shim/src/espi.c
@@ -10,7 +10,6 @@
#include <zephyr/logging/log.h>
#include <zephyr/kernel.h>
#include <stdint.h>
-#include <zephyr/kernel.h>
#include <ap_power/ap_power.h>
#include <ap_power/ap_power_events.h>
diff --git a/zephyr/shim/src/hooks.c b/zephyr/shim/src/hooks.c
index 426b11ace9..ecc28266e9 100644
--- a/zephyr/shim/src/hooks.c
+++ b/zephyr/shim/src/hooks.c
@@ -4,7 +4,6 @@
*/
#include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
#include <ap_power/ap_power.h>
#include <ap_power/ap_power_events.h>
diff --git a/zephyr/shim/src/hwtimer.c b/zephyr/shim/src/hwtimer.c
index ffab438299..df4324f6a1 100644
--- a/zephyr/shim/src/hwtimer.c
+++ b/zephyr/shim/src/hwtimer.c
@@ -5,7 +5,6 @@
#include <zephyr/kernel.h>
#include <stdint.h>
-#include <zephyr/kernel.h>
#include "hwtimer.h"
diff --git a/zephyr/shim/src/rtc.c b/zephyr/shim/src/rtc.c
index 96e979ea26..93f945d1ef 100644
--- a/zephyr/shim/src/rtc.c
+++ b/zephyr/shim/src/rtc.c
@@ -5,7 +5,6 @@
#include <zephyr/logging/log.h>
#include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
#include "console.h"
#include "drivers/cros_rtc.h"
diff --git a/zephyr/test/drivers/default/src/usb_mux.c b/zephyr/test/drivers/default/src/usb_mux.c
index c4b1a6515b..a2f064e396 100644
--- a/zephyr/test/drivers/default/src/usb_mux.c
+++ b/zephyr/test/drivers/default/src/usb_mux.c
@@ -4,7 +4,6 @@
*/
#include <zephyr/kernel.h>
-#include <zephyr/kernel.h>
#include <zephyr/ztest.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/gpio/gpio_emul.h>