Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
ba9d35fb
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,发现更多精彩内容 >>
提交
ba9d35fb
编写于
4月 18, 2005
作者:
P
Pavel Machek
提交者:
Greg K-H
4月 18, 2005
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[PATCH] USB: fix up remaining pm_message_t usages
Signed-off-by:
N
Greg Kroah-Hartman
<
gregkh@suse.de
>
上级
9a5d3e98
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
12 deletion
+12
-12
drivers/usb/core/hub.c
drivers/usb/core/hub.c
+2
-2
drivers/usb/gadget/omap_udc.c
drivers/usb/gadget/omap_udc.c
+5
-7
drivers/usb/host/ohci-omap.c
drivers/usb/host/ohci-omap.c
+3
-1
drivers/usb/host/ohci-pxa27x.c
drivers/usb/host/ohci-pxa27x.c
+2
-2
未找到文件。
drivers/usb/core/hub.c
浏览文件 @
ba9d35fb
...
...
@@ -1456,7 +1456,7 @@ static void hub_port_logical_disconnect(struct usb_hub *hub, int port1)
/* FIXME let caller ask to power down the port:
* - some devices won't enumerate without a VBUS power cycle
* - SRP saves power that way
* - usb_suspend_device(dev,
PM_SUSPEND_DISK
)
* - usb_suspend_device(dev,
PMSG_SUSPEND
)
* That's easy if this hub can switch power per-port, and
* khubd reactivates the port later (timer, SRP, etc).
* Powerdown must be optional, because of reset/DFU.
...
...
@@ -1531,7 +1531,7 @@ static int hub_port_suspend(struct usb_hub *hub, int port1,
/*
* Devices on USB hub ports have only one "suspend" state, corresponding
* to ACPI D2
(PM_SUSPEND_MEM)
, "may cause the device to lose some context".
* to ACPI D2, "may cause the device to lose some context".
* State transitions include:
*
* - suspend, resume ... when the VBUS power link stays live
...
...
drivers/usb/gadget/omap_udc.c
浏览文件 @
ba9d35fb
...
...
@@ -2809,17 +2809,15 @@ static int __exit omap_udc_remove(struct device *dev)
return
0
;
}
/* suspend/resume/wakeup from sysfs (echo > power/state) */
static
int
omap_udc_suspend
(
struct
device
*
dev
,
u32
state
,
u32
level
)
static
int
omap_udc_suspend
(
struct
device
*
dev
,
pm_message_t
state
,
u32
level
)
{
if
(
level
!=
0
)
return
0
;
DBG
(
"suspend, state %d
\n
"
,
state
);
omap_pullup
(
&
udc
->
gadget
,
0
);
udc
->
gadget
.
dev
.
power
.
power_state
=
3
;
udc
->
gadget
.
dev
.
parent
->
power
.
power_state
=
3
;
udc
->
gadget
.
dev
.
power
.
power_state
=
PMSG_SUSPEND
;
udc
->
gadget
.
dev
.
parent
->
power
.
power_state
=
PMSG_SUSPEND
;
return
0
;
}
...
...
@@ -2829,8 +2827,8 @@ static int omap_udc_resume(struct device *dev, u32 level)
return
0
;
DBG
(
"resume + wakeup/SRP
\n
"
);
udc
->
gadget
.
dev
.
parent
->
power
.
power_state
=
0
;
udc
->
gadget
.
dev
.
power
.
power_state
=
0
;
udc
->
gadget
.
dev
.
parent
->
power
.
power_state
=
PMSG_ON
;
udc
->
gadget
.
dev
.
power
.
power_state
=
PMSG_ON
;
omap_pullup
(
&
udc
->
gadget
,
1
);
/* maybe the host would enumerate us if we nudged it */
...
...
drivers/usb/host/ohci-omap.c
浏览文件 @
ba9d35fb
...
...
@@ -458,9 +458,11 @@ static int ohci_hcd_omap_drv_remove(struct device *dev)
/* states match PCI usage, always suspending the root hub except that
* 4 ~= D3cold (ACPI D3) with clock off (resume sees reset).
*
* FIXME: above comment is not right, and code is wrong, too :-(.
*/
static
int
ohci_omap_suspend
(
struct
device
*
dev
,
u32
state
,
u32
level
)
static
int
ohci_omap_suspend
(
struct
device
*
dev
,
pm_message_t
state
,
u32
level
)
{
struct
ohci_hcd
*
ohci
=
hcd_to_ohci
(
dev_get_drvdata
(
dev
));
int
status
=
-
EINVAL
;
...
...
drivers/usb/host/ohci-pxa27x.c
浏览文件 @
ba9d35fb
...
...
@@ -337,7 +337,7 @@ static int ohci_hcd_pxa27x_drv_remove(struct device *dev)
return
0
;
}
static
int
ohci_hcd_pxa27x_drv_suspend
(
struct
device
*
dev
,
u32
state
,
u32
level
)
static
int
ohci_hcd_pxa27x_drv_suspend
(
struct
device
*
dev
,
pm_message_t
state
,
u32
level
)
{
// struct platform_device *pdev = to_platform_device(dev);
// struct usb_hcd *hcd = dev_get_drvdata(dev);
...
...
@@ -346,7 +346,7 @@ static int ohci_hcd_pxa27x_drv_suspend(struct device *dev, u32 state, u32 level)
return
0
;
}
static
int
ohci_hcd_pxa27x_drv_resume
(
struct
device
*
dev
,
u32
state
)
static
int
ohci_hcd_pxa27x_drv_resume
(
struct
device
*
dev
,
u32
level
)
{
// struct platform_device *pdev = to_platform_device(dev);
// struct usb_hcd *hcd = dev_get_drvdata(dev);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录