Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
633aae23
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
633aae23
编写于
7月 22, 2009
作者:
D
Dmitry Torokhov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Input: serio - switch to using dev_pm_ops
Signed-off-by:
N
Dmitry Torokhov
<
dtor@mail.ru
>
上级
ebd7768d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
14 deletion
+11
-14
drivers/input/serio/serio.c
drivers/input/serio/serio.c
+11
-12
include/linux/serio.h
include/linux/serio.h
+0
-2
未找到文件。
drivers/input/serio/serio.c
浏览文件 @
633aae23
...
...
@@ -931,15 +931,11 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
#endif
/* CONFIG_HOTPLUG */
#ifdef CONFIG_PM
static
int
serio_suspend
(
struct
device
*
dev
,
pm_message_t
state
)
static
int
serio_suspend
(
struct
device
*
dev
)
{
struct
serio
*
serio
=
to_serio_port
(
dev
);
if
(
!
serio
->
suspended
&&
state
.
event
==
PM_EVENT_SUSPEND
)
serio_cleanup
(
serio
);
serio
->
suspended
=
state
.
event
==
PM_EVENT_SUSPEND
||
state
.
event
==
PM_EVENT_FREEZE
;
serio_cleanup
(
serio
);
return
0
;
}
...
...
@@ -952,13 +948,17 @@ static int serio_resume(struct device *dev)
* Driver reconnect can take a while, so better let kseriod
* deal with it.
*/
if
(
serio
->
suspended
)
{
serio
->
suspended
=
false
;
serio_queue_event
(
serio
,
NULL
,
SERIO_RECONNECT_PORT
);
}
serio_queue_event
(
serio
,
NULL
,
SERIO_RECONNECT_PORT
);
return
0
;
}
static
const
struct
dev_pm_ops
serio_pm_ops
=
{
.
suspend
=
serio_suspend
,
.
resume
=
serio_resume
,
.
poweroff
=
serio_suspend
,
.
restore
=
serio_resume
,
};
#endif
/* CONFIG_PM */
/* called from serio_driver->connect/disconnect methods under serio_mutex */
...
...
@@ -1015,8 +1015,7 @@ static struct bus_type serio_bus = {
.
remove
=
serio_driver_remove
,
.
shutdown
=
serio_shutdown
,
#ifdef CONFIG_PM
.
suspend
=
serio_suspend
,
.
resume
=
serio_resume
,
.
pm
=
&
serio_pm_ops
,
#endif
};
...
...
include/linux/serio.h
浏览文件 @
633aae23
...
...
@@ -31,8 +31,6 @@ struct serio {
bool
manual_bind
;
bool
registered
;
/* port has been fully registered with driver core */
bool
suspended
;
/* port is suspended */
struct
serio_device_id
id
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录