diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2013-10-02 16:36:10 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-10-04 01:54:46 +0000 |
| commit | 9ef58858c40e93c611c1260bea39d004c1687a18 (patch) | |
| tree | d42e21cc1c08366e2217225f5069e2f59346cb8c /chip/lm4/fan.c | |
| parent | 3990a8e32370d9ec05263b35a765b650bfd40acd (diff) | |
| download | chrome-ec-9ef58858c40e93c611c1260bea39d004c1687a18.tar.gz | |
Cleanup use of config.h macros
include/config.h should have the canonical list of all CONFIG_* macros used
everywhere else. This fixes some that weren't included, and some that had
been changed in one place but not in others.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=manual
Build everything. It should still work.
cd src/plaform/ec
make runtests
for i in bds bolt daisy discovery falco kirby link mccroskey peppy pit puppy rambi samus slippy snow spring; do make BOARD=$i || touch died.$i; done
There shouldn't be any died.* files.
Change-Id: I0a1ec2d57668509c514dc5a521e547836a3e9894
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/171690
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip/lm4/fan.c')
| -rw-r--r-- | chip/lm4/fan.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chip/lm4/fan.c b/chip/lm4/fan.c index 98e19e767e..d6f8b9915f 100644 --- a/chip/lm4/fan.c +++ b/chip/lm4/fan.c @@ -45,9 +45,9 @@ static void fan_set_enabled(int enable) { pwm_enable(PWM_CH_FAN, enable); -#ifdef CONFIG_PWM_FAN_EN_GPIO - gpio_set_level(CONFIG_PWM_FAN_EN_GPIO, enable); -#endif /* CONFIG_PWM_FAN_EN_GPIO */ +#ifdef CONFIG_FAN_EN_GPIO + gpio_set_level(CONFIG_FAN_EN_GPIO, enable); +#endif /* CONFIG_FAN_EN_GPIO */ } static int fan_get_rpm_mode(void) @@ -192,12 +192,12 @@ static int cc_faninfo(int argc, char **argv) ccprintf("Mode: %s\n", fan_get_rpm_mode() ? "rpm" : "duty"); ccprintf("Auto: %s\n", thermal_control_enabled ? "yes" : "no"); ccprintf("Enable: %s\n", fan_get_enabled() ? "yes" : "no"); -#ifdef CONFIG_PWM_FAN_POWER_GOOD +#ifdef CONFIG_FAN_POWER_GOOD ccprintf("Power: %s\n", -#ifdef CONFIG_PWM_FAN_EN_GPIO - gpio_get_level(CONFIG_PWM_FAN_EN_GPIO) && +#ifdef CONFIG_FAN_EN_GPIO + gpio_get_level(CONFIG_FAN_EN_GPIO) && #endif - gpio_get_level(CONFIG_PWM_FAN_POWER_GOOD) ? "yes" : "no"); + gpio_get_level(CONFIG_FAN_POWER_GOOD) ? "yes" : "no"); #endif |