From e76f15f4fdf2d2094b351a6a1a95dec1c63d017c Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 19 Apr 2021 15:20:28 +0200 Subject: [PATCH] src: Replace remaining {get,set}_option() instances With this change, the type-unsafe {get,set}_option() API functions are no longer used directly. The old API gets dropped in a follow-up. Change-Id: Id3f3e172c850d50a7d2f348b1c3736969c73837d Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/52512 Reviewed-by: Patrick Rudolph Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/console/init.c | 2 +- src/cpu/intel/hyperthreading/intel_sibling.c | 2 +- src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c | 4 ++-- src/drivers/lenovo/hybrid_graphics/romstage.c | 4 ++-- src/mainboard/lenovo/x60/smihandler.c | 7 ++----- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/console/init.c b/src/console/init.c index c59807785c..fdc1467cdd 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -26,7 +26,7 @@ static void init_log_level(void) console_loglevel = get_console_loglevel(); if (!FIRST_CONSOLE) - get_option(&console_loglevel, "debug_level"); + console_loglevel = get_int_option("debug_level", console_loglevel); } int console_log_level(int msg_level) diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c index ef3367d019..888a2fddda 100644 --- a/src/cpu/intel/hyperthreading/intel_sibling.c +++ b/src/cpu/intel/hyperthreading/intel_sibling.c @@ -21,7 +21,7 @@ void intel_sibling_init(struct device *cpu) /* On the bootstrap processor see if I want sibling cpus enabled */ if (first_time) { first_time = 0; - get_option(&disable_siblings, "hyper_threading"); + disable_siblings = get_int_option("hyper_threading", disable_siblings); } result = cpuid(1); /* Is hyperthreading supported */ diff --git a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c index 8f0e7bd4b3..bae8a54c58 100644 --- a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c +++ b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c @@ -14,7 +14,7 @@ static void lenovo_hybrid_graphics_enable(struct device *dev) { const struct drivers_lenovo_hybrid_graphics_config *config; - enum hybrid_graphics_req mode = HYBRID_GRAPHICS_DEFAULT_GPU; + enum hybrid_graphics_req mode; /* Don't confuse anyone else and disable the fake device */ dev->enabled = 0; @@ -25,7 +25,7 @@ static void lenovo_hybrid_graphics_enable(struct device *dev) return; } - get_option(&mode, "hybrid_graphics_mode"); + mode = get_int_option("hybrid_graphics_mode", HYBRID_GRAPHICS_DEFAULT_GPU); if (mode == HYBRID_GRAPHICS_DISCRETE) { printk(BIOS_DEBUG, "Hybrid graphics:" diff --git a/src/drivers/lenovo/hybrid_graphics/romstage.c b/src/drivers/lenovo/hybrid_graphics/romstage.c index 3d14646479..747c9b73ae 100644 --- a/src/drivers/lenovo/hybrid_graphics/romstage.c +++ b/src/drivers/lenovo/hybrid_graphics/romstage.c @@ -18,7 +18,7 @@ void early_hybrid_graphics(bool *enable_igd, bool *enable_peg) { const struct drivers_lenovo_hybrid_graphics_config *config; const struct device *dev; - enum hybrid_graphics_req mode = HYBRID_GRAPHICS_DEFAULT_GPU; + enum hybrid_graphics_req mode; /* TODO: Use generic device instead of dummy PNP device */ dev = dev_find_slot_pnp(HYBRID_GRAPHICS_PORT, HYBRID_GRAPHICS_DEVICE); @@ -39,7 +39,7 @@ void early_hybrid_graphics(bool *enable_igd, bool *enable_peg) return; } - get_option(&mode, "hybrid_graphics_mode"); + mode = get_int_option("hybrid_graphics_mode", HYBRID_GRAPHICS_DEFAULT_GPU); if (mode == HYBRID_GRAPHICS_DISCRETE) { printk(BIOS_DEBUG, "Hybrid graphics:" diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c index ab8a1e89a8..20ca060d82 100644 --- a/src/mainboard/lenovo/x60/smihandler.c +++ b/src/mainboard/lenovo/x60/smihandler.c @@ -17,16 +17,13 @@ static void mainboard_smi_save_cmos(void) { - u8 val; u8 tmp70, tmp72; tmp70 = inb(0x70); tmp72 = inb(0x72); - val = pci_read_config8(PCI_DEV(0, 2, 1), 0xf4); - set_option("tft_brightness", &val); - val = ec_read(H8_VOLUME_CONTROL); - set_option("volume", &val); + set_int_option("tft_brightness", pci_read_config8(PCI_DEV(0, 2, 1), 0xf4)); + set_int_option("volume", ec_read(H8_VOLUME_CONTROL)); outb(tmp70, 0x70); outb(tmp72, 0x72);