Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
a57bf8a4
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
a57bf8a4
编写于
12月 12, 2006
作者:
W
Wim Van Sebroeck
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
上级
d4b87598
e0b79e0b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
27 deletion
+27
-27
drivers/char/watchdog/at91rm9200_wdt.c
drivers/char/watchdog/at91rm9200_wdt.c
+3
-3
drivers/char/watchdog/mpcore_wdt.c
drivers/char/watchdog/mpcore_wdt.c
+1
-1
drivers/char/watchdog/omap_wdt.c
drivers/char/watchdog/omap_wdt.c
+1
-1
drivers/char/watchdog/rm9k_wdt.c
drivers/char/watchdog/rm9k_wdt.c
+22
-22
未找到文件。
drivers/char/watchdog/at91rm9200_wdt.c
浏览文件 @
a57bf8a4
...
...
@@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
{
int
res
;
if
(
at91wdt_miscdev
.
dev
)
if
(
at91wdt_miscdev
.
parent
)
return
-
EBUSY
;
at91wdt_miscdev
.
dev
=
&
pdev
->
dev
;
at91wdt_miscdev
.
parent
=
&
pdev
->
dev
;
res
=
misc_register
(
&
at91wdt_miscdev
);
if
(
res
)
...
...
@@ -221,7 +221,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
res
=
misc_deregister
(
&
at91wdt_miscdev
);
if
(
!
res
)
at91wdt_miscdev
.
dev
=
NULL
;
at91wdt_miscdev
.
parent
=
NULL
;
return
res
;
}
...
...
drivers/char/watchdog/mpcore_wdt.c
浏览文件 @
a57bf8a4
...
...
@@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto
err_free
;
}
mpcore_wdt_miscdev
.
dev
=
&
dev
->
dev
;
mpcore_wdt_miscdev
.
parent
=
&
dev
->
dev
;
ret
=
misc_register
(
&
mpcore_wdt_miscdev
);
if
(
ret
)
{
dev_printk
(
KERN_ERR
,
_dev
,
"cannot register miscdev on minor=%d (err=%d)
\n
"
,
...
...
drivers/char/watchdog/omap_wdt.c
浏览文件 @
a57bf8a4
...
...
@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
omap_wdt_disable
();
omap_wdt_adjust_timeout
(
timer_margin
);
omap_wdt_miscdev
.
dev
=
&
pdev
->
dev
;
omap_wdt_miscdev
.
parent
=
&
pdev
->
dev
;
ret
=
misc_register
(
&
omap_wdt_miscdev
);
if
(
ret
)
goto
fail
;
...
...
drivers/char/watchdog/rm9k_wdt.c
浏览文件 @
a57bf8a4
...
...
@@ -47,7 +47,7 @@
/* Function prototypes */
static
irqreturn_t
wdt_gpi_irqhdl
(
int
,
void
*
,
struct
pt_regs
*
);
static
irqreturn_t
wdt_gpi_irqhdl
(
int
,
void
*
);
static
void
wdt_gpi_start
(
void
);
static
void
wdt_gpi_stop
(
void
);
static
void
wdt_gpi_set_timeout
(
unsigned
int
);
...
...
@@ -94,8 +94,28 @@ module_param(nowayout, bool, 0444);
MODULE_PARM_DESC
(
nowayout
,
"Watchdog cannot be disabled once started"
);
/* Kernel interfaces */
static
struct
file_operations
fops
=
{
.
owner
=
THIS_MODULE
,
.
open
=
wdt_gpi_open
,
.
release
=
wdt_gpi_release
,
.
write
=
wdt_gpi_write
,
.
unlocked_ioctl
=
wdt_gpi_ioctl
,
};
static
struct
miscdevice
miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
wdt_gpi_name
,
.
fops
=
&
fops
,
};
static
struct
notifier_block
wdt_gpi_shutdown
=
{
.
notifier_call
=
wdt_gpi_notify
,
};
/* Interrupt handler */
static
irqreturn_t
wdt_gpi_irqhdl
(
int
irq
,
void
*
ctxt
,
struct
pt_regs
*
regs
)
static
irqreturn_t
wdt_gpi_irqhdl
(
int
irq
,
void
*
ctxt
)
{
if
(
!
unlikely
(
__raw_readl
(
wd_regs
+
0x0008
)
&
0x1
))
return
IRQ_NONE
;
...
...
@@ -312,26 +332,6 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
}
/* Kernel interfaces */
static
struct
file_operations
fops
=
{
.
owner
=
THIS_MODULE
,
.
open
=
wdt_gpi_open
,
.
release
=
wdt_gpi_release
,
.
write
=
wdt_gpi_write
,
.
unlocked_ioctl
=
wdt_gpi_ioctl
,
};
static
struct
miscdevice
miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
wdt_gpi_name
,
.
fops
=
&
fops
,
};
static
struct
notifier_block
wdt_gpi_shutdown
=
{
.
notifier_call
=
wdt_gpi_notify
,
};
/* Init & exit procedures */
static
const
struct
resource
*
wdt_gpi_get_resource
(
struct
platform_device
*
pdv
,
const
char
*
name
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录