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 <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52512
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-04-19 15:20:28 +02:00
parent 3aa757d705
commit e76f15f4fd
5 changed files with 8 additions and 11 deletions

View File

@ -26,7 +26,7 @@ static void init_log_level(void)
console_loglevel = get_console_loglevel(); console_loglevel = get_console_loglevel();
if (!FIRST_CONSOLE) 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) int console_log_level(int msg_level)

View File

@ -21,7 +21,7 @@ void intel_sibling_init(struct device *cpu)
/* On the bootstrap processor see if I want sibling cpus enabled */ /* On the bootstrap processor see if I want sibling cpus enabled */
if (first_time) { if (first_time) {
first_time = 0; first_time = 0;
get_option(&disable_siblings, "hyper_threading"); disable_siblings = get_int_option("hyper_threading", disable_siblings);
} }
result = cpuid(1); result = cpuid(1);
/* Is hyperthreading supported */ /* Is hyperthreading supported */

View File

@ -14,7 +14,7 @@
static void lenovo_hybrid_graphics_enable(struct device *dev) static void lenovo_hybrid_graphics_enable(struct device *dev)
{ {
const struct drivers_lenovo_hybrid_graphics_config *config; 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 */ /* Don't confuse anyone else and disable the fake device */
dev->enabled = 0; dev->enabled = 0;
@ -25,7 +25,7 @@ static void lenovo_hybrid_graphics_enable(struct device *dev)
return; return;
} }
get_option(&mode, "hybrid_graphics_mode"); mode = get_int_option("hybrid_graphics_mode", HYBRID_GRAPHICS_DEFAULT_GPU);
if (mode == HYBRID_GRAPHICS_DISCRETE) { if (mode == HYBRID_GRAPHICS_DISCRETE) {
printk(BIOS_DEBUG, "Hybrid graphics:" printk(BIOS_DEBUG, "Hybrid graphics:"

View File

@ -18,7 +18,7 @@ void early_hybrid_graphics(bool *enable_igd, bool *enable_peg)
{ {
const struct drivers_lenovo_hybrid_graphics_config *config; const struct drivers_lenovo_hybrid_graphics_config *config;
const struct device *dev; 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 */ /* TODO: Use generic device instead of dummy PNP device */
dev = dev_find_slot_pnp(HYBRID_GRAPHICS_PORT, HYBRID_GRAPHICS_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; return;
} }
get_option(&mode, "hybrid_graphics_mode"); mode = get_int_option("hybrid_graphics_mode", HYBRID_GRAPHICS_DEFAULT_GPU);
if (mode == HYBRID_GRAPHICS_DISCRETE) { if (mode == HYBRID_GRAPHICS_DISCRETE) {
printk(BIOS_DEBUG, "Hybrid graphics:" printk(BIOS_DEBUG, "Hybrid graphics:"

View File

@ -17,16 +17,13 @@
static void mainboard_smi_save_cmos(void) static void mainboard_smi_save_cmos(void)
{ {
u8 val;
u8 tmp70, tmp72; u8 tmp70, tmp72;
tmp70 = inb(0x70); tmp70 = inb(0x70);
tmp72 = inb(0x72); tmp72 = inb(0x72);
val = pci_read_config8(PCI_DEV(0, 2, 1), 0xf4); set_int_option("tft_brightness", pci_read_config8(PCI_DEV(0, 2, 1), 0xf4));
set_option("tft_brightness", &val); set_int_option("volume", ec_read(H8_VOLUME_CONTROL));
val = ec_read(H8_VOLUME_CONTROL);
set_option("volume", &val);
outb(tmp70, 0x70); outb(tmp70, 0x70);
outb(tmp72, 0x72); outb(tmp72, 0x72);