Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
1577ddfa
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1577ddfa
编写于
8月 08, 2016
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'thermal-intel' and 'thermal-core' into next
上级
70c50ee7
165989a5
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
18 addition
and
3 deletion
+18
-3
drivers/thermal/clock_cooling.c
drivers/thermal/clock_cooling.c
+1
-0
drivers/thermal/fair_share.c
drivers/thermal/fair_share.c
+2
-0
drivers/thermal/gov_bang_bang.c
drivers/thermal/gov_bang_bang.c
+2
-0
drivers/thermal/power_allocator.c
drivers/thermal/power_allocator.c
+2
-0
drivers/thermal/step_wise.c
drivers/thermal/step_wise.c
+2
-0
drivers/thermal/thermal_core.c
drivers/thermal/thermal_core.c
+7
-3
drivers/thermal/thermal_hwmon.c
drivers/thermal/thermal_hwmon.c
+2
-0
未找到文件。
drivers/thermal/clock_cooling.c
浏览文件 @
1577ddfa
...
...
@@ -426,6 +426,7 @@ clock_cooling_register(struct device *dev, const char *clock_name)
if
(
!
ccdev
)
return
ERR_PTR
(
-
ENOMEM
);
mutex_init
(
&
ccdev
->
lock
);
ccdev
->
dev
=
dev
;
ccdev
->
clk
=
devm_clk_get
(
dev
,
clock_name
);
if
(
IS_ERR
(
ccdev
->
clk
))
...
...
drivers/thermal/fair_share.c
浏览文件 @
1577ddfa
...
...
@@ -116,7 +116,9 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip)
instance
->
target
=
get_target_state
(
tz
,
cdev
,
percentage
,
cur_trip_level
);
mutex_lock
(
&
instance
->
cdev
->
lock
);
instance
->
cdev
->
updated
=
false
;
mutex_unlock
(
&
instance
->
cdev
->
lock
);
thermal_cdev_update
(
cdev
);
}
return
0
;
...
...
drivers/thermal/gov_bang_bang.c
浏览文件 @
1577ddfa
...
...
@@ -71,7 +71,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
dev_dbg
(
&
instance
->
cdev
->
device
,
"target=%d
\n
"
,
(
int
)
instance
->
target
);
mutex_lock
(
&
instance
->
cdev
->
lock
);
instance
->
cdev
->
updated
=
false
;
/* cdev needs update */
mutex_unlock
(
&
instance
->
cdev
->
lock
);
}
mutex_unlock
(
&
tz
->
lock
);
...
...
drivers/thermal/power_allocator.c
浏览文件 @
1577ddfa
...
...
@@ -529,7 +529,9 @@ static void allow_maximum_power(struct thermal_zone_device *tz)
continue
;
instance
->
target
=
0
;
mutex_lock
(
&
instance
->
cdev
->
lock
);
instance
->
cdev
->
updated
=
false
;
mutex_unlock
(
&
instance
->
cdev
->
lock
);
thermal_cdev_update
(
instance
->
cdev
);
}
}
...
...
drivers/thermal/step_wise.c
浏览文件 @
1577ddfa
...
...
@@ -175,7 +175,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
update_passive_instance
(
tz
,
trip_type
,
-
1
);
instance
->
initialized
=
true
;
mutex_lock
(
&
instance
->
cdev
->
lock
);
instance
->
cdev
->
updated
=
false
;
/* cdev needs update */
mutex_unlock
(
&
instance
->
cdev
->
lock
);
}
mutex_unlock
(
&
tz
->
lock
);
...
...
drivers/thermal/thermal_core.c
浏览文件 @
1577ddfa
...
...
@@ -1093,7 +1093,9 @@ int power_actor_set_power(struct thermal_cooling_device *cdev,
return
ret
;
instance
->
target
=
state
;
mutex_lock
(
&
cdev
->
lock
);
cdev
->
updated
=
false
;
mutex_unlock
(
&
cdev
->
lock
);
thermal_cdev_update
(
cdev
);
return
0
;
...
...
@@ -1623,11 +1625,13 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev)
struct
thermal_instance
*
instance
;
unsigned
long
target
=
0
;
mutex_lock
(
&
cdev
->
lock
);
/* cooling device is updated*/
if
(
cdev
->
updated
)
if
(
cdev
->
updated
)
{
mutex_unlock
(
&
cdev
->
lock
);
return
;
}
mutex_lock
(
&
cdev
->
lock
);
/* Make sure cdev enters the deepest cooling state */
list_for_each_entry
(
instance
,
&
cdev
->
thermal_instances
,
cdev_node
)
{
dev_dbg
(
&
cdev
->
device
,
"zone%d->target=%lu
\n
"
,
...
...
@@ -1637,9 +1641,9 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev)
if
(
instance
->
target
>
target
)
target
=
instance
->
target
;
}
mutex_unlock
(
&
cdev
->
lock
);
cdev
->
ops
->
set_cur_state
(
cdev
,
target
);
cdev
->
updated
=
true
;
mutex_unlock
(
&
cdev
->
lock
);
trace_cdev_update
(
cdev
,
target
);
dev_dbg
(
&
cdev
->
device
,
"set to state %lu
\n
"
,
target
);
}
...
...
drivers/thermal/thermal_hwmon.c
浏览文件 @
1577ddfa
...
...
@@ -232,6 +232,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
return
result
;
}
EXPORT_SYMBOL_GPL
(
thermal_add_hwmon_sysfs
);
void
thermal_remove_hwmon_sysfs
(
struct
thermal_zone_device
*
tz
)
{
...
...
@@ -270,3 +271,4 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
hwmon_device_unregister
(
hwmon
->
device
);
kfree
(
hwmon
);
}
EXPORT_SYMBOL_GPL
(
thermal_remove_hwmon_sysfs
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录