Angel Pons has uploaded this change for review.

View Change

superio: Use `read_option_X` helpers

Change-Id: Ia46b622c52f98d4cc5fb7d9b02e2aeb366ef3915
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/superio/ite/it8720f/superio.c
M src/superio/nuvoton/nct5572d/superio.c
M src/superio/winbond/w83627ehg/superio.c
M src/superio/winbond/w83627hf/superio.c
M src/superio/winbond/w83667hg-a/superio.c
5 files changed, 7 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/47136/1

diff --git a/src/superio/ite/it8720f/superio.c b/src/superio/ite/it8720f/superio.c
index c395953..39cb799 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 = read_option_int("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 c0a7118..5fc508a 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -47,8 +47,8 @@
 		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 = read_option_u8("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 7793fa4..2d1178a 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -23,9 +23,8 @@
 static void init_acpi(struct device *dev)
 {
 	u8 value;
-	int power_on = 1;
+	int power_on = read_option_int("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 c6d2f57..c10569f 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -23,9 +23,7 @@
 static void init_acpi(struct device *dev)
 {
 	u8 value;
-	int power_on = 1;
-
-	get_option(&power_on, "power_on_after_fail");
+	int power_on = read_option_int("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 828fe9a..48cd4bf 100644
--- a/src/superio/winbond/w83667hg-a/superio.c
+++ b/src/superio/winbond/w83667hg-a/superio.c
@@ -47,8 +47,8 @@
 		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 = read_option_u8("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);

To view, visit change 47136. To unsubscribe, or for help writing mail filters, visit settings.