11 files changed, 19 insertions, 44 deletions
diff --git a/driver/temp_sensor/adt7481.c b/driver/temp_sensor/adt7481.c
index f0aee1506f..0157d64b2d 100644
--- a/driver/temp_sensor/adt7481.c
+++ b/driver/temp_sensor/adt7481.c
@@ -5,12 +5,12 @@
 
 /* ADT7481 temperature sensor module for Chrome EC */
 
-#include "adt7481.h"
 #include "common.h"
 #include "console.h"
+#include "adt7481.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/amd_r19me4070.c b/driver/temp_sensor/amd_r19me4070.c
index 3ee230da09..97868b6945 100644
--- a/driver/temp_sensor/amd_r19me4070.c
+++ b/driver/temp_sensor/amd_r19me4070.c
@@ -5,12 +5,12 @@
 
 /* R19ME4070 temperature sensor module for Chrome EC */
 
-#include "amd_r19me4070.h"
 #include "chipset.h"
 #include "common.h"
 #include "console.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "amd_r19me4070.h"
 #include "power.h"
 
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/driver/temp_sensor/f75303.c b/driver/temp_sensor/f75303.c
index d83f7bc4a6..e686537c31 100644
--- a/driver/temp_sensor/f75303.c
+++ b/driver/temp_sensor/f75303.c
@@ -6,11 +6,11 @@
 /* F75303 temperature sensor module for Chrome EC */
 
 #include "common.h"
-#include "console.h"
 #include "f75303.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
+#include "console.h"
 
 static int temps[F75303_IDX_COUNT];
 static int8_t fake_temp[F75303_IDX_COUNT] = { -1, -1, -1 };
diff --git a/driver/temp_sensor/g753.c b/driver/temp_sensor/g753.c
index f162cbf846..8d94cac4f8 100644
--- a/driver/temp_sensor/g753.c
+++ b/driver/temp_sensor/g753.c
@@ -9,8 +9,8 @@
 #include "console.h"
 #include "g753.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c
index 413e2dda8a..82cb2d26e9 100644
--- a/driver/temp_sensor/g78x.c
+++ b/driver/temp_sensor/g78x.c
@@ -9,8 +9,8 @@
 #include "console.h"
 #include "g78x.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/oti502.c b/driver/temp_sensor/oti502.c
index 4564ad9257..2051df89f6 100644
--- a/driver/temp_sensor/oti502.c
+++ b/driver/temp_sensor/oti502.c
@@ -7,9 +7,9 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
-#include "i2c.h"
 #include "oti502.h"
+#include "i2c.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_ambient; /* Ambient is chip temperature*/
diff --git a/driver/temp_sensor/pct2075.c b/driver/temp_sensor/pct2075.c
index 02150ad796..9c7b7190e9 100644
--- a/driver/temp_sensor/pct2075.c
+++ b/driver/temp_sensor/pct2075.c
@@ -7,8 +7,8 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "math_util.h"
 #include "temp_sensor/pct2075.h"
 #include "util.h"
@@ -76,7 +76,6 @@ int pct2075_get_val_mk(int idx, int *temp_mk_ptr)
 	return EC_SUCCESS;
 }
 
-#ifndef CONFIG_ZEPHYR
 static void pct2075_poll(void)
 {
 	int s;
@@ -88,18 +87,6 @@ static void pct2075_poll(void)
 	}
 }
 DECLARE_HOOK(HOOK_SECOND, pct2075_poll, HOOK_PRIO_TEMP_SENSOR);
-#else
-void pct2075_update_temperature(int idx)
-{
-	int temp_reg = 0;
-
-	if (idx >= PCT2075_COUNT)
-		return;
-
-	if (get_reg_temp(idx, &temp_reg) == EC_SUCCESS)
-		temp_mk_local[idx] = pct2075_reg_to_mk(temp_reg);
-}
-#endif /* CONFIG_ZEPHYR */
 
 void pct2075_init(void)
 {
diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c
index 267227f6f3..f7f28159aa 100644
--- a/driver/temp_sensor/tmp112.c
+++ b/driver/temp_sensor/tmp112.c
@@ -7,8 +7,8 @@
 
 #include "common.h"
 #include "console.h"
-#include "hooks.h"
 #include "i2c.h"
+#include "hooks.h"
 #include "math_util.h"
 #include "temp_sensor/tmp112.h"
 #include "util.h"
@@ -92,7 +92,6 @@ int tmp112_get_val_mk(int idx, int *temp_mk_ptr)
 	return EC_SUCCESS;
 }
 
-#ifndef CONFIG_ZEPHYR
 static void tmp112_poll(void)
 {
 	int s;
@@ -104,18 +103,6 @@ static void tmp112_poll(void)
 	}
 }
 DECLARE_HOOK(HOOK_SECOND, tmp112_poll, HOOK_PRIO_TEMP_SENSOR);
-#else
-static void tmp112_update_temperature(int idx)
-{
-	int temp_reg = 0;
-
-	if (idx >= TMP112_COUNT)
-		return;
-
-	if (get_reg_temp(idx, &temp_reg) == EC_SUCCESS)
-		temp_mk_local[idx] = tmp112_reg_to_mk(temp_reg);
-}
-#endif /* CONFIG_ZEPHYR */
 
 void tmp112_init(void)
 {
diff --git a/driver/temp_sensor/tmp411.c b/driver/temp_sensor/tmp411.c
index 4f8a08a181..8a14440671 100644
--- a/driver/temp_sensor/tmp411.c
+++ b/driver/temp_sensor/tmp411.c
@@ -7,10 +7,10 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp411.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp411.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/tmp432.c b/driver/temp_sensor/tmp432.c
index 581e33b979..fde6536536 100644
--- a/driver/temp_sensor/tmp432.c
+++ b/driver/temp_sensor/tmp432.c
@@ -7,10 +7,10 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp432.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp432.h"
+#include "hooks.h"
 #include "util.h"
 
 static int temp_val_local;
diff --git a/driver/temp_sensor/tmp468.c b/driver/temp_sensor/tmp468.c
index 3bfaeeedbb..87eb040460 100644
--- a/driver/temp_sensor/tmp468.c
+++ b/driver/temp_sensor/tmp468.c
@@ -7,13 +7,14 @@
 
 #include "common.h"
 #include "console.h"
+#include "tmp432.h"
 #include "gpio.h"
-#include "hooks.h"
 #include "i2c.h"
-#include "tmp432.h"
-#include "tmp468.h"
+#include "hooks.h"
 #include "util.h"
 
+#include "tmp468.h"
+
 static int fake_temp[TMP468_CHANNEL_COUNT] = { -1, -1, -1, -1, -1,
 					       -1, -1, -1, -1 };
 static int temp_val[TMP468_CHANNEL_COUNT] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };