global: Refactor get_option usage
Restructure get_option() calls to avoid unnecessary return value checks by pre-assigning defaults to the options being retrieved. Change-Id: I9159afe149a8eeed0785d1efd6eee8420b88b8f4 Signed-off-by: Varad Gautam <varadgautam@gmail.com> Reviewed-on: http://review.coreboot.org/8631 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
parent
015f0aea5d
commit
06ef046045
|
@ -37,8 +37,8 @@ int console_log_level(int msg_level)
|
|||
void console_init(void)
|
||||
{
|
||||
#if !defined(__PRE_RAM__)
|
||||
if(get_option(&console_loglevel, "debug_level") != CB_SUCCESS)
|
||||
console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
|
||||
get_option(&console_loglevel, "debug_level");
|
||||
#endif
|
||||
|
||||
#if CONFIG_EARLY_PCI_BRIDGE && !defined(__SMM__)
|
||||
|
|
|
@ -250,9 +250,8 @@ static void init_ecc_memory(unsigned node_id)
|
|||
}
|
||||
|
||||
/* See if we scrubbing should be enabled */
|
||||
enable_scrubbing = 1;
|
||||
if (get_option(&enable_scrubbing, "hw_scrubber") != CB_SUCCESS)
|
||||
enable_scrubbing = CONFIG_HW_SCRUBBER;
|
||||
get_option(&enable_scrubbing, "hw_scrubber");
|
||||
|
||||
/* Enable cache scrubbing at the lowest possible rate */
|
||||
if (enable_scrubbing) {
|
||||
|
|
|
@ -80,19 +80,19 @@ void hwm_setup(void)
|
|||
int cpufan_speed = 0, sysfan_speed = 0;
|
||||
int cpufan_temperature = 0, sysfan_temperature = 0;
|
||||
|
||||
if (get_option(&cpufan_control, "cpufan_cruise_control") != CB_SUCCESS)
|
||||
cpufan_control = FAN_CRUISE_CONTROL_DISABLED;
|
||||
if (get_option(&cpufan_speed, "cpufan_speed") != CB_SUCCESS)
|
||||
get_option(&cpufan_control, "cpufan_cruise_control");
|
||||
cpufan_speed = FAN_SPEED_5625;
|
||||
//if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS)
|
||||
get_option(&cpufan_speed, "cpufan_speed");
|
||||
//cpufan_temperature = FAN_TEMPERATURE_30DEGC;
|
||||
//get_option(&cpufan_temperature, "cpufan_temperature");
|
||||
|
||||
if (get_option(&sysfan_control, "sysfan_cruise_control") != CB_SUCCESS)
|
||||
sysfan_control = FAN_CRUISE_CONTROL_DISABLED;
|
||||
if (get_option(&sysfan_speed, "sysfan_speed") != CB_SUCCESS)
|
||||
get_option(&sysfan_control, "sysfan_cruise_control");
|
||||
sysfan_speed = FAN_SPEED_5625;
|
||||
//if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS)
|
||||
get_option(&sysfan_speed, "sysfan_speed");
|
||||
//sysfan_temperature = FAN_TEMPERATURE_30DEGC;
|
||||
//get_option(&sysfan_temperature, "sysfan_temperature");
|
||||
|
||||
// hwm_write(0x31, 0x20); // AVCC high limit
|
||||
// hwm_write(0x34, 0x06); // VIN2 low limit
|
||||
|
|
|
@ -79,19 +79,19 @@ static void hwm_setup(void)
|
|||
int cpufan_speed = 0, sysfan_speed = 0;
|
||||
int cpufan_temperature = 0, sysfan_temperature = 0;
|
||||
|
||||
if (get_option(&cpufan_control, "cpufan_cruise_control") != CB_SUCCESS)
|
||||
cpufan_control = FAN_CRUISE_CONTROL_DISABLED;
|
||||
if (get_option(&cpufan_speed, "cpufan_speed") != CB_SUCCESS)
|
||||
get_option(&cpufan_control, "cpufan_cruise_control");
|
||||
cpufan_speed = FAN_SPEED_5625;
|
||||
//if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS)
|
||||
get_option(&cpufan_speed, "cpufan_speed");
|
||||
//cpufan_temperature = FAN_TEMPERATURE_30DEGC;
|
||||
//get_option(&cpufan_temperature, "cpufan_temperature");
|
||||
|
||||
if (get_option(&sysfan_control, "sysfan_cruise_control") != CB_SUCCESS)
|
||||
sysfan_control = FAN_CRUISE_CONTROL_DISABLED;
|
||||
if (get_option(&sysfan_speed, "sysfan_speed") != CB_SUCCESS)
|
||||
get_option(&sysfan_control, "sysfan_cruise_control");
|
||||
sysfan_speed = FAN_SPEED_5625;
|
||||
//if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS)
|
||||
get_option(&sysfan_speed, "sysfan_speed");
|
||||
//sysfan_temperature = FAN_TEMPERATURE_30DEGC;
|
||||
//get_option(&sysfan_temperature, "sysfan_temperature");
|
||||
|
||||
// hwm_write(0x31, 0x20); // AVCC high limit
|
||||
// hwm_write(0x34, 0x06); // VIN2 low limit
|
||||
|
|
|
@ -47,9 +47,8 @@ static void mcf3_read_resources(device_t dev)
|
|||
return;
|
||||
}
|
||||
|
||||
iommu = 1;
|
||||
if (get_option(&iommu, "iommu") != CB_SUCCESS)
|
||||
iommu = CONFIG_IOMMU;
|
||||
get_option(&iommu, "iommu");
|
||||
|
||||
if (iommu) {
|
||||
/* Add a GART aperture resource */
|
||||
|
|
|
@ -119,10 +119,8 @@ static void sata_init(struct device *dev)
|
|||
pci_write_config8(dev, 0x40, byte);
|
||||
|
||||
// 1 means IDE, 0 means AHCI
|
||||
if (get_option(&i, "sata_mode") != CB_SUCCESS) {
|
||||
// no cmos option
|
||||
i = CONFIG_SATA_MODE;
|
||||
}
|
||||
get_option(&i, "sata_mode");
|
||||
printk(BIOS_INFO, "%s: setting sata mode = %s\n", __func__, (i == SATA_MODE_IDE)?"ide":"ahci" );
|
||||
|
||||
dword = pci_read_config32(dev, 0x8);
|
||||
|
|
|
@ -116,8 +116,8 @@ static void i82801dx_power_options(device_t dev)
|
|||
*
|
||||
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
|
||||
*/
|
||||
if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
|
||||
pwr_on = MAINBOARD_POWER_ON;
|
||||
get_option(&pwr_on, "power_on_after_fail");
|
||||
|
||||
reg8 = pci_read_config8(dev, GEN_PMCON_3);
|
||||
reg8 &= 0xfe;
|
||||
|
|
|
@ -179,8 +179,8 @@ static void i82801gx_power_options(device_t dev)
|
|||
*
|
||||
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
|
||||
*/
|
||||
if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
|
||||
pwr_on = MAINBOARD_POWER_ON;
|
||||
get_option(&pwr_on, "power_on_after_fail");
|
||||
|
||||
reg8 = pci_read_config8(dev, GEN_PMCON_3);
|
||||
reg8 &= 0xfe;
|
||||
|
|
|
@ -186,8 +186,8 @@ static void i82801ix_power_options(device_t dev)
|
|||
*
|
||||
* If the option is not existent (Laptops), use MAINBOARD_POWER_ON.
|
||||
*/
|
||||
if (get_option(&pwr_on, "power_on_after_fail") != CB_SUCCESS)
|
||||
pwr_on = MAINBOARD_POWER_ON;
|
||||
get_option(&pwr_on, "power_on_after_fail");
|
||||
|
||||
reg8 = pci_read_config8(dev, D31F0_GEN_PMCON_3);
|
||||
reg8 &= 0xfe;
|
||||
|
|
Loading…
Reference in New Issue