From 9dc1c51db47f43190c9396e9dd77f051530265a4 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 2 Nov 2020 20:59:32 +0100 Subject: [PATCH] ec/lenovo: Use get_int_option() Change-Id: Ie5cb54b171244be71848a59a788ed8d42b3e3161 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/47111 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/ec/lenovo/h8/bluetooth.c | 7 +---- src/ec/lenovo/h8/h8.c | 59 ++++++++++++------------------------ src/ec/lenovo/h8/wwan.c | 7 +---- src/ec/lenovo/pmh7/pmh7.c | 9 ++---- 4 files changed, 24 insertions(+), 58 deletions(-) diff --git a/src/ec/lenovo/h8/bluetooth.c b/src/ec/lenovo/h8/bluetooth.c index 9e0b266a67..463e0e3332 100644 --- a/src/ec/lenovo/h8/bluetooth.c +++ b/src/ec/lenovo/h8/bluetooth.c @@ -48,10 +48,5 @@ bool h8_has_bdc(const struct device *dev) */ bool h8_bluetooth_nv_enable(void) { - u8 val; - - if (get_option(&val, "bluetooth") != CB_SUCCESS) - return true; - - return val; + return get_int_option("bluetooth", true); } diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 093a639ed5..be2eee6f74 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -242,9 +242,8 @@ static void h8_enable(struct device *dev) reg8 = conf->config1; if (conf->has_keyboard_backlight) { - if (get_option(&val, "backlight") != CB_SUCCESS) - val = 0; /* Both backlights. */ - reg8 = (reg8 & 0xf3) | ((val & 0x3) << 2); + /* Default to both backlights */ + reg8 = (reg8 & 0xf3) | ((get_int_option("backlight", 0) & 0x3) << 2); } ec_write(H8_CONFIG1, reg8); ec_write(H8_CONFIG2, conf->config2); @@ -253,17 +252,15 @@ static void h8_enable(struct device *dev) beepmask0 = conf->beepmask0; beepmask1 = conf->beepmask1; - if (conf->has_power_management_beeps - && get_option(&val, "power_management_beeps") == CB_SUCCESS - && val == 0) { - beepmask0 = 0x00; - beepmask1 = 0x00; + if (conf->has_power_management_beeps) { + if (get_int_option("power_management_beeps", 1) == 0) { + beepmask0 = 0x00; + beepmask1 = 0x00; + } } if (conf->has_power_management_beeps) { - if (get_option(&val, "low_battery_beep") != CB_SUCCESS) - val = 1; - if (val) + if (get_int_option("low_battery_beep", 1)) beepmask0 |= 2; else beepmask0 &= ~2; @@ -295,19 +292,16 @@ static void h8_enable(struct device *dev) ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO); - if (get_option(&val, "usb_always_on") != CB_SUCCESS) - val = 0; - h8_usb_always_on_enable(val); + h8_usb_always_on_enable(get_int_option("usb_always_on", 0)); - if (get_option(&val, "wlan") != CB_SUCCESS) - val = 1; - h8_wlan_enable(val); + h8_wlan_enable(get_int_option("wlan", 1)); h8_trackpoint_enable(1); h8_usb_power_enable(1); - if (get_option(&val, "volume") == CB_SUCCESS && !acpi_is_wakeup_s3()) - ec_write(H8_VOLUME_CONTROL, val); + int volume = get_int_option("volume", -1); + if (volume >= 0 && !acpi_is_wakeup_s3()) + ec_write(H8_VOLUME_CONTROL, volume); val = (CONFIG(H8_SUPPORT_BT_ON_WIFI) || h8_has_bdc(dev)) && h8_bluetooth_nv_enable(); @@ -316,30 +310,17 @@ static void h8_enable(struct device *dev) val = h8_has_wwan(dev) && h8_wwan_nv_enable(); h8_wwan_enable(val); - if (conf->has_uwb) { - if (get_option(&val, "uwb") != CB_SUCCESS) - val = 1; + if (conf->has_uwb) + h8_uwb_enable(get_int_option("uwb", 1)); - h8_uwb_enable(val); - } + h8_fn_ctrl_swap(get_int_option("fn_ctrl_swap", 0)); - if (get_option(&val, "fn_ctrl_swap") != CB_SUCCESS) - val = 0; - h8_fn_ctrl_swap(val); + h8_sticky_fn(get_int_option("sticky_fn", 0)); - if (get_option(&val, "sticky_fn") != CB_SUCCESS) - val = 0; - h8_sticky_fn(val); + if (CONFIG(H8_HAS_PRIMARY_FN_KEYS)) + f1_to_f12_as_primary(get_int_option("f1_to_f12_as_primary", 1)); - if (CONFIG(H8_HAS_PRIMARY_FN_KEYS)) { - if (get_option(&val, "f1_to_f12_as_primary") != CB_SUCCESS) - val = 1; - f1_to_f12_as_primary(val); - } - - if (get_option(&val, "first_battery") != CB_SUCCESS) - val = PRIMARY_BATTERY; - h8_charge_priority(val); + h8_charge_priority(get_int_option("first_battery", PRIMARY_BATTERY)); h8_set_audio_mute(0); h8_mb_init(); diff --git a/src/ec/lenovo/h8/wwan.c b/src/ec/lenovo/h8/wwan.c index fbd9d29fe1..90f6b47bbb 100644 --- a/src/ec/lenovo/h8/wwan.c +++ b/src/ec/lenovo/h8/wwan.c @@ -46,10 +46,5 @@ bool h8_has_wwan(const struct device *dev) */ bool h8_wwan_nv_enable(void) { - u8 val; - - if (get_option(&val, "wwan") != CB_SUCCESS) - return true; - - return val; + return get_int_option("wwan", true); } diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c index de07a7b0f6..f32c9f18d9 100644 --- a/src/ec/lenovo/pmh7/pmh7.c +++ b/src/ec/lenovo/pmh7/pmh7.c @@ -106,7 +106,6 @@ static void enable_dev(struct device *dev) { const struct ec_lenovo_pmh7_config *conf = dev->chip_info; struct resource *resource; - u8 val; resource = new_resource(dev, EC_LENOVO_PMH7_INDEX); resource->flags = IORESOURCE_IO | IORESOURCE_FIXED; @@ -118,13 +117,9 @@ static void enable_dev(struct device *dev) pmh7_backlight_enable(conf->backlight_enable); pmh7_dock_event_enable(conf->dock_event_enable); - if (get_option(&val, "touchpad") != CB_SUCCESS) - val = 1; - pmh7_touchpad_enable(val); + pmh7_touchpad_enable(get_int_option("touchpad", 1)); - if (get_option(&val, "trackpoint") != CB_SUCCESS) - val = 1; - pmh7_trackpoint_enable(val); + pmh7_trackpoint_enable(get_int_option("trackpoint", 1)); printk(BIOS_INFO, "PMH7: ID %02x Revision %02x\n", pmh7_register_read(EC_LENOVO_PMH7_REG_ID),