diff --git a/src/soc/mediatek/common/mt6315.c b/src/soc/mediatek/common/mt6315.c
index aebbd4c8a5..7862c59104 100644
--- a/src/soc/mediatek/common/mt6315.c
+++ b/src/soc/mediatek/common/mt6315.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <assert.h>
 #include <console/console.h>
 #include <delay.h>
 #include <soc/mt6315.h>
@@ -84,11 +85,11 @@ u32 mt6315_buck_get_voltage(u32 slvid, u32 buck_id)
 
 static void init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPMI, 0);
-		if (!pmif_arb)
-			die("ERROR: No spmi device");
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPMI, 0);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("ERROR - Failed to initialize pmif spmi");
diff --git a/src/soc/mediatek/common/mt6316.c b/src/soc/mediatek/common/mt6316.c
index 797ae3e8c0..b7242fda01 100644
--- a/src/soc/mediatek/common/mt6316.c
+++ b/src/soc/mediatek/common/mt6316.c
@@ -171,10 +171,11 @@ static void mt6316_set_all_test_con9(void)
 
 static void init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_0);
-		assert(pmif_arb);
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_0);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("ERROR - Failed to initialize pmif spmi");
diff --git a/src/soc/mediatek/common/mt6359p.c b/src/soc/mediatek/common/mt6359p.c
index e766479722..fc7c6773b0 100644
--- a/src/soc/mediatek/common/mt6359p.c
+++ b/src/soc/mediatek/common/mt6359p.c
@@ -331,11 +331,11 @@ void mt6359p_enable_vm18(bool enable)
 
 void mt6359p_init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPI, 0);
-		if (!pmif_arb)
-			die("ERROR: No spi device");
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPI, 0);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("ERROR - Failed to initialize pmif spi");
diff --git a/src/soc/mediatek/common/mt6363.c b/src/soc/mediatek/common/mt6363.c
index a618b6f04b..ba96163b11 100644
--- a/src/soc/mediatek/common/mt6363.c
+++ b/src/soc/mediatek/common/mt6363.c
@@ -261,10 +261,11 @@ void mt6363_enable_vram_mdfe(bool enable)
 
 void mt6363_init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
-		assert(pmif_arb);
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("ERROR - Failed to initialize pmif spi");
diff --git a/src/soc/mediatek/common/mt6373.c b/src/soc/mediatek/common/mt6373.c
index 1d5e1e25be..8dca0a065d 100644
--- a/src/soc/mediatek/common/mt6373.c
+++ b/src/soc/mediatek/common/mt6373.c
@@ -241,10 +241,11 @@ static void mt6373_pmic_wdt_set(void)
 
 void mt6373_init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
-		assert(pmif_arb);
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("%s: initialization failed", __func__);
diff --git a/src/soc/mediatek/common/mt6685.c b/src/soc/mediatek/common/mt6685.c
index fa434f4d48..81ee6c63aa 100644
--- a/src/soc/mediatek/common/mt6685.c
+++ b/src/soc/mediatek/common/mt6685.c
@@ -80,10 +80,11 @@ static void mt6685_unlock(bool unlock)
 
 void mt6685_init_pmif_arb(void)
 {
-	if (!pmif_arb) {
-		pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
-		assert(pmif_arb);
-	}
+	if (pmif_arb)
+		return;
+
+	pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
+	assert(pmif_arb);
 
 	if (pmif_arb->is_pmif_init_done(pmif_arb))
 		die("ERROR - Failed to initialize pmif spi");