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 /drivers/thermal/fair_share.c | |
parent | thermal: dove: Fix thermal sensor formula (diff) | |
parent | Thermal: build cpu_cooling code into thermal_sys module (diff) | |
download | linux-dev-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.tar.xz linux-dev-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.zip |
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 'drivers/thermal/fair_share.c')
-rw-r--r-- | drivers/thermal/fair_share.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c index 792479f2b64b..944ba2f340c8 100644 --- a/drivers/thermal/fair_share.c +++ b/drivers/thermal/fair_share.c @@ -22,9 +22,6 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#include <linux/module.h> #include <linux/thermal.h> #include "thermal_core.h" @@ -111,23 +108,15 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip) static struct thermal_governor thermal_gov_fair_share = { .name = "fair_share", .throttle = fair_share_throttle, - .owner = THIS_MODULE, }; -static int __init thermal_gov_fair_share_init(void) +int thermal_gov_fair_share_register(void) { return thermal_register_governor(&thermal_gov_fair_share); } -static void __exit thermal_gov_fair_share_exit(void) +void thermal_gov_fair_share_unregister(void) { thermal_unregister_governor(&thermal_gov_fair_share); } -/* This should load after thermal framework */ -fs_initcall(thermal_gov_fair_share_init); -module_exit(thermal_gov_fair_share_exit); - -MODULE_AUTHOR("Durgadoss R"); -MODULE_DESCRIPTION("A simple weight based thermal throttling governor"); -MODULE_LICENSE("GPL"); |