diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 09:26:58 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 09:26:58 +0800 |
| commit | d13cb03aef0c062dcdd16b411bd4c02c1574ff08 (patch) | |
| tree | 0ee1d535ddf0ca49cd88484f042d12996f689e1c /include/linux/thermal.h | |
| parent | 2fd1db8819fbf73b5f74b4b4a205ab7be0957944 (diff) | |
| parent | bbf7fc88c78f7317e2cdcf77e974c8a9a8312641 (diff) | |
Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next
Conflicts:
drivers/thermal/cpu_cooling.c
Diffstat (limited to 'include/linux/thermal.h')
| -rw-r--r-- | include/linux/thermal.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index fd7b8f3e6f42..3bda306f7a50 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -33,8 +33,11 @@ #define THERMAL_MAX_TRIPS 12 #define THERMAL_NAME_LENGTH 20 +/* invalid cooling state */ +#define THERMAL_CSTATE_INVALID -1UL + /* No upper/lower limit requirement */ -#define THERMAL_NO_LIMIT -1UL +#define THERMAL_NO_LIMIT THERMAL_CSTATE_INVALID /* Unit conversion macros */ #define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \ @@ -184,7 +187,6 @@ struct thermal_governor { char name[THERMAL_NAME_LENGTH]; int (*throttle)(struct thermal_zone_device *tz, int trip); struct list_head governor_list; - struct module *owner; }; /* Structure that holds binding parameters for a zone */ @@ -244,9 +246,6 @@ struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, void thermal_cdev_update(struct thermal_cooling_device *); void notify_thermal_framework(struct thermal_zone_device *, int); -int thermal_register_governor(struct thermal_governor *); -void thermal_unregister_governor(struct thermal_governor *); - #ifdef CONFIG_NET extern int thermal_generate_netlink_event(struct thermal_zone_device *tz, enum events event); |