diff options
| author |   Zhang Rui <rui.zhang@intel.com> | 2015-06-11 10:55:42 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 10:55:42 +0800 |
| commit | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 (patch) | |
| tree | fc48ebe4fbf8e6c48cc07fcdab82a6010f7c61cf /drivers/thermal/thermal_core.h | |
| parent | Linux 4.1-rc4 (diff) | |
| parent | thermal: hisilicon: add new hisilicon thermal sensor driver (diff) | |
| download | linux-dev-53daf9383f34d7bf61358a37449fb4d59fbdafc2.tar.xz linux-dev-53daf9383f34d7bf61358a37449fb4d59fbdafc2.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/thermal_core.h')
| -rw-r--r-- | drivers/thermal/thermal_core.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 8e391812e503..d7ac1fccd659 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -46,8 +46,11 @@ struct thermal_instance { unsigned long target; /* expected cooling state */ char attr_name[THERMAL_NAME_LENGTH]; struct device_attribute attr; + char weight_attr_name[THERMAL_NAME_LENGTH]; + struct device_attribute weight_attr; struct list_head tz_node; /* node in tz->thermal_instances */ struct list_head cdev_node; /* node in cdev->thermal_instances */ + unsigned int weight; /* The weight of the cooling device */ }; int thermal_register_governor(struct thermal_governor *); @@ -85,6 +88,14 @@ static inline int thermal_gov_user_space_register(void) { return 0; } static inline void thermal_gov_user_space_unregister(void) {} #endif /* CONFIG_THERMAL_GOV_USER_SPACE */ +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR +int thermal_gov_power_allocator_register(void); +void thermal_gov_power_allocator_unregister(void); +#else +static inline int thermal_gov_power_allocator_register(void) { return 0; } +static inline void thermal_gov_power_allocator_unregister(void) {} +#endif /* CONFIG_THERMAL_GOV_POWER_ALLOCATOR */ + /* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones(void); |