5 files changed, 7 insertions, 12 deletions
diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c
index c395953911..0ecbddc6a2 100644
--- a/src/superio/ite/it8720f/superio.c
+++ b/src/superio/ite/it8720f/superio.c
@@ -17,11 +17,9 @@
 
 static void power_control_init(struct device *dev)
 {
-	int power_on = MAINBOARD_POWER_OFF;
+	int power_on = get_int_option("power_on_after_fail", MAINBOARD_POWER_OFF);
 	u8 value;
 
-	get_option(&power_on, "power_on_after_fail");
-
 	pnp_enter_conf_mode(dev);
 	pnp_set_logical_device(dev);
 
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index c0a71186af..b26954df9d 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -47,8 +47,8 @@ static void nct5572d_init(struct device *dev)
 		break;
 	case NCT5572D_ACPI:
 		/* Set power state after power fail */
-		power_status = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
-		get_option(&power_status, "power_on_after_fail");
+		power_status = get_int_option("power_on_after_fail",
+				CONFIG_MAINBOARD_POWER_FAILURE_STATE);
 		pnp_enter_conf_mode(dev);
 		pnp_set_logical_device(dev);
 		byte = pnp_read_config(dev, 0xe4);
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 7793fa4544..2f0a3a4869 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -23,9 +23,8 @@ static void enable_hwm_smbus(struct device *dev)
 static void init_acpi(struct device *dev)
 {
 	u8 value;
-	int power_on = 1;
+	int power_on = get_int_option("power_on_after_fail", 1);
 
-	get_option(&power_on, "power_on_after_fail");
 	pnp_enter_conf_mode(dev);
 	pnp_set_logical_device(dev);
 	value = pnp_read_config(dev, 0xe4);
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index c6d2f577cc..5af2d37c45 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -23,9 +23,7 @@ static void enable_hwm_smbus(struct device *dev)
 static void init_acpi(struct device *dev)
 {
 	u8 value;
-	int power_on = 1;
-
-	get_option(&power_on, "power_on_after_fail");
+	int power_on = get_int_option("power_on_after_fail", 1);
 
 	pnp_enter_conf_mode(dev);
 	pnp_set_logical_device(dev);
diff --git a/src/superio/winbond/w83667hg-a/superio.c b/src/superio/winbond/w83667hg-a/superio.c
index 828fe9af04..5f9683299b 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -47,8 +47,8 @@ static void w83667hg_a_init(struct device *dev)
 		break;
 	case W83667HG_A_ACPI:
 		/* Set power state after power fail */
-		power_status = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
-		get_option(&power_status, "power_on_after_fail");
+		power_status = get_int_option("power_on_after_fail",
+				CONFIG_MAINBOARD_POWER_FAILURE_STATE);
 		pnp_enter_conf_mode(dev);
 		pnp_set_logical_device(dev);
 		byte = pnp_read_config(dev, 0xe4);