1 files changed, 7 insertions, 10 deletions
diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c
index e73d04e988..d64a22860d 100644
--- a/chip/npcx/espi.c
+++ b/chip/npcx/espi.c
@@ -5,18 +5,18 @@
 
 /* ESPI module for Chrome EC */
 
-#include "chipset.h"
-#include "console.h"
-#include "espi.h"
-#include "hooks.h"
-#include "lpc_chip.h"
-#include "power.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "timer.h"
+#include "chipset.h"
+#include "console.h"
 #include "uart.h"
 #include "util.h"
+#include "power.h"
+#include "espi.h"
+#include "lpc_chip.h"
+#include "hooks.h"
+#include "timer.h"
 
 /* Console output macros */
 #if !(DEBUG_ESPI)
@@ -274,9 +274,6 @@ void espi_wait_vw_not_dirty(enum espi_vw_signal signal, unsigned int timeout_us)
 	uint64_t timeout;
 
 	sig_idx = espi_vw_get_signal_index(signal);
-	/* Cannot find signal index */
-	if (sig_idx < 0)
-		return;
 
 	for (offset = 0; offset < ESPI_VWEVSM_NUM; offset++) {
 		uint8_t vw_idx = VWEVSM_IDX_GET(NPCX_VWEVSM(offset));