From 9ff48ff131b44af163190aca38673a952652f90d Mon Sep 17 00:00:00 2001
From: Jeremy Bettis <jbettis@google.com>
Date: Fri, 18 Nov 2022 15:49:50 -0700
Subject: zephyr/program: Sort header files

Sort all headers in zephyr/test with the clang-format rules used by the
zephyr project.

BRANCH=None
BUG=b:247100970
TEST=zmake build -a
TEST=./twister --clobber -v -i
TEST=make -j$(nproc) buildall_only runtests
TEST=zmake compare-builds

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ibd81df9a27fc0c934b4134106d6f09487439c245
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4039149
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
---
 zephyr/program/nissa/pujjo/src/charger.c     | 12 ++++++------
 zephyr/program/nissa/pujjo/src/fan.c         |  9 ++++-----
 zephyr/program/nissa/pujjo/src/form_factor.c |  9 ++++-----
 zephyr/program/nissa/pujjo/src/led.c         |  4 ++--
 zephyr/program/nissa/pujjo/src/usbc.c        | 13 ++++++-------
 5 files changed, 22 insertions(+), 25 deletions(-)

(limited to 'zephyr/program/nissa/pujjo/src')

diff --git a/zephyr/program/nissa/pujjo/src/charger.c b/zephyr/program/nissa/pujjo/src/charger.c
index f1f1d57790..8763f24793 100644
--- a/zephyr/program/nissa/pujjo/src/charger.c
+++ b/zephyr/program/nissa/pujjo/src/charger.c
@@ -3,18 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
-#include "driver/tcpm/raa489000.h"
-#include "driver/charger/isl923x.h"
 #include "console.h"
+#include "driver/charger/isl923x.h"
+#include "driver/tcpm/raa489000.h"
 #include "extpower.h"
-#include "usb_pd.h"
-#include "nissa_common.h"
 #include "hooks.h"
+#include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/pujjo/src/fan.c b/zephyr/program/nissa/pujjo/src/fan.c
index 97323a7edf..8b8634a653 100644
--- a/zephyr/program/nissa/pujjo/src/fan.c
+++ b/zephyr/program/nissa/pujjo/src/fan.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/pujjo/src/form_factor.c b/zephyr/program/nissa/pujjo/src/form_factor.c
index 1b096e8fa4..f160c88d78 100644
--- a/zephyr/program/nissa/pujjo/src/form_factor.c
+++ b/zephyr/program/nissa/pujjo/src/form_factor.c
@@ -3,9 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "button.h"
 #include "cros_board_info.h"
@@ -16,11 +13,13 @@
 #include "driver/accelgyro_lsm6dsm.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
-#include "motionsense_sensors.h"
 #include "motion_sense.h"
+#include "motionsense_sensors.h"
+#include "nissa_common.h"
 #include "tablet_mode.h"
 
-#include "nissa_common.h"
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/pujjo/src/led.c b/zephyr/program/nissa/pujjo/src/led.c
index bd04af5a25..4d859f2764 100644
--- a/zephyr/program/nissa/pujjo/src/led.c
+++ b/zephyr/program/nissa/pujjo/src/led.c
@@ -10,9 +10,9 @@
  */
 
 #include "common.h"
-#include "led_onoff_states.h"
-#include "led_common.h"
 #include "gpio.h"
+#include "led_common.h"
+#include "led_onoff_states.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ##args)
diff --git a/zephyr/program/nissa/pujjo/src/usbc.c b/zephyr/program/nissa/pujjo/src/usbc.c
index 5d3d94c243..b56e36049c 100644
--- a/zephyr/program/nissa/pujjo/src/usbc.c
+++ b/zephyr/program/nissa/pujjo/src/usbc.c
@@ -3,19 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
-- 
cgit v1.2.1