From 06ef04604570d402687245521731053c66888b15 Mon Sep 17 00:00:00 2001 From: Varad Gautam Date: Wed, 11 Mar 2015 09:54:41 +0530 Subject: 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 Reviewed-on: http://review.coreboot.org/8631 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Marc Jones --- src/mainboard/ibase/mb899/superio_hwm.c | 26 +++++++++++++------------- src/mainboard/kontron/986lcd-m/mainboard.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/ibase/mb899/superio_hwm.c b/src/mainboard/ibase/mb899/superio_hwm.c index 7864264d41..4c7d123bdc 100644 --- a/src/mainboard/ibase/mb899/superio_hwm.c +++ b/src/mainboard/ibase/mb899/superio_hwm.c @@ -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) - cpufan_speed = FAN_SPEED_5625; - //if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS) - // cpufan_temperature = FAN_TEMPERATURE_30DEGC; - - 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) - sysfan_speed = FAN_SPEED_5625; - //if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS) - // sysfan_temperature = FAN_TEMPERATURE_30DEGC; + cpufan_control = FAN_CRUISE_CONTROL_DISABLED; + get_option(&cpufan_control, "cpufan_cruise_control"); + cpufan_speed = FAN_SPEED_5625; + get_option(&cpufan_speed, "cpufan_speed"); + //cpufan_temperature = FAN_TEMPERATURE_30DEGC; + //get_option(&cpufan_temperature, "cpufan_temperature"); + + sysfan_control = FAN_CRUISE_CONTROL_DISABLED; + get_option(&sysfan_control, "sysfan_cruise_control"); + sysfan_speed = FAN_SPEED_5625; + 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 diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index afca796000..d943127e3b 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -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) - cpufan_speed = FAN_SPEED_5625; - //if (get_option(&cpufan_temperature, "cpufan_temperature") != CB_SUCCESS) - // cpufan_temperature = FAN_TEMPERATURE_30DEGC; - - 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) - sysfan_speed = FAN_SPEED_5625; - //if (get_option(&sysfan_temperature, "sysfan_temperature") != CB_SUCCESS) - // sysfan_temperature = FAN_TEMPERATURE_30DEGC; + cpufan_control = FAN_CRUISE_CONTROL_DISABLED; + get_option(&cpufan_control, "cpufan_cruise_control"); + cpufan_speed = FAN_SPEED_5625; + get_option(&cpufan_speed, "cpufan_speed"); + //cpufan_temperature = FAN_TEMPERATURE_30DEGC; + //get_option(&cpufan_temperature, "cpufan_temperature"); + + sysfan_control = FAN_CRUISE_CONTROL_DISABLED; + get_option(&sysfan_control, "sysfan_cruise_control"); + sysfan_speed = FAN_SPEED_5625; + 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 -- cgit v1.2.3