Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
7944d3a5
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
7944d3a5
编写于
16年前
作者:
W
Wim Van Sebroeck
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[WATCHDOG] more coding style clean-up's
More coding style clean-up's. Signed-off-by:
N
Wim Van Sebroeck
<
wim@iguana.be
>
上级
12b7a152
变更
40
隐藏空白更改
内联
并排
Showing
40 changed file
with
199 addition
and
227 deletion
+199
-227
drivers/watchdog/Kconfig
drivers/watchdog/Kconfig
+1
-1
drivers/watchdog/Makefile
drivers/watchdog/Makefile
+1
-1
drivers/watchdog/acquirewdt.c
drivers/watchdog/acquirewdt.c
+1
-1
drivers/watchdog/advantechwdt.c
drivers/watchdog/advantechwdt.c
+9
-8
drivers/watchdog/alim1535_wdt.c
drivers/watchdog/alim1535_wdt.c
+1
-1
drivers/watchdog/alim7101_wdt.c
drivers/watchdog/alim7101_wdt.c
+2
-2
drivers/watchdog/ar7_wdt.c
drivers/watchdog/ar7_wdt.c
+2
-2
drivers/watchdog/at32ap700x_wdt.c
drivers/watchdog/at32ap700x_wdt.c
+1
-1
drivers/watchdog/eurotechwdt.c
drivers/watchdog/eurotechwdt.c
+3
-5
drivers/watchdog/geodewdt.c
drivers/watchdog/geodewdt.c
+26
-36
drivers/watchdog/hpwdt.c
drivers/watchdog/hpwdt.c
+2
-2
drivers/watchdog/i6300esb.c
drivers/watchdog/i6300esb.c
+17
-17
drivers/watchdog/iTCO_vendor_support.c
drivers/watchdog/iTCO_vendor_support.c
+5
-5
drivers/watchdog/iTCO_wdt.c
drivers/watchdog/iTCO_wdt.c
+5
-5
drivers/watchdog/ib700wdt.c
drivers/watchdog/ib700wdt.c
+4
-8
drivers/watchdog/ibmasr.c
drivers/watchdog/ibmasr.c
+2
-2
drivers/watchdog/iop_wdt.c
drivers/watchdog/iop_wdt.c
+1
-1
drivers/watchdog/it8712f_wdt.c
drivers/watchdog/it8712f_wdt.c
+1
-1
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ixp4xx_wdt.c
+6
-7
drivers/watchdog/mpc5200_wdt.c
drivers/watchdog/mpc5200_wdt.c
+3
-3
drivers/watchdog/mpcore_wdt.c
drivers/watchdog/mpcore_wdt.c
+4
-4
drivers/watchdog/mtx-1_wdt.c
drivers/watchdog/mtx-1_wdt.c
+2
-2
drivers/watchdog/omap_wdt.c
drivers/watchdog/omap_wdt.c
+1
-1
drivers/watchdog/pc87413_wdt.c
drivers/watchdog/pc87413_wdt.c
+19
-19
drivers/watchdog/pcwd.c
drivers/watchdog/pcwd.c
+3
-3
drivers/watchdog/pcwd_pci.c
drivers/watchdog/pcwd_pci.c
+12
-16
drivers/watchdog/pcwd_usb.c
drivers/watchdog/pcwd_usb.c
+29
-32
drivers/watchdog/rm9k_wdt.c
drivers/watchdog/rm9k_wdt.c
+6
-7
drivers/watchdog/sb_wdog.c
drivers/watchdog/sb_wdog.c
+2
-2
drivers/watchdog/sbc60xxwdt.c
drivers/watchdog/sbc60xxwdt.c
+2
-2
drivers/watchdog/sc1200wdt.c
drivers/watchdog/sc1200wdt.c
+1
-1
drivers/watchdog/scx200_wdt.c
drivers/watchdog/scx200_wdt.c
+1
-1
drivers/watchdog/smsc37b787_wdt.c
drivers/watchdog/smsc37b787_wdt.c
+2
-2
drivers/watchdog/txx9wdt.c
drivers/watchdog/txx9wdt.c
+1
-1
drivers/watchdog/w83627hf_wdt.c
drivers/watchdog/w83627hf_wdt.c
+4
-5
drivers/watchdog/w83697hf_wdt.c
drivers/watchdog/w83697hf_wdt.c
+5
-6
drivers/watchdog/wafer5823wdt.c
drivers/watchdog/wafer5823wdt.c
+9
-11
drivers/watchdog/wd501p.h
drivers/watchdog/wd501p.h
+1
-1
drivers/watchdog/wdrtas.c
drivers/watchdog/wdrtas.c
+1
-1
drivers/watchdog/wdt_pci.c
drivers/watchdog/wdt_pci.c
+1
-1
未找到文件。
drivers/watchdog/Kconfig
浏览文件 @
7944d3a5
...
...
@@ -463,7 +463,7 @@ config PC87413_WDT
module will be called pc87413_wdt.
Most people will say N.
config 60XX_WDT
tristate "SBC-60XX Watchdog Timer"
depends on X86
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/Makefile
浏览文件 @
7944d3a5
...
...
@@ -92,7 +92,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
# MIPS Architecture
obj-$(CONFIG_INDYDOG)
+=
indydog.o
obj-$(CONFIG_WDT_MTX1)
+=
mtx-1_wdt.o
obj-$(CONFIG_WDT_MTX1)
+=
mtx-1_wdt.o
obj-$(CONFIG_WDT_RM9K_GPI)
+=
rm9k_wdt.o
obj-$(CONFIG_SIBYTE_WDOG)
+=
sb_wdog.o
obj-$(CONFIG_AR7_WDT)
+=
ar7_wdt.o
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/acquirewdt.c
浏览文件 @
7944d3a5
...
...
@@ -126,7 +126,7 @@ static ssize_t acq_write(struct file *file, const char __user *buf,
if
(
!
nowayout
)
{
size_t
i
;
/* note: just in case someone wrote the magic character
*
five months ago... */
five months ago... */
expect_close
=
0
;
/* scan to see whether or not we got the
magic character */
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/advantechwdt.c
浏览文件 @
7944d3a5
...
...
@@ -47,7 +47,8 @@
#define WATCHDOG_NAME "Advantech WDT"
#define WATCHDOG_TIMEOUT 60
/* 60 sec default timeout */
static
struct
platform_device
*
advwdt_platform_device
;
/* the watchdog platform device */
/* the watchdog platform device */
static
struct
platform_device
*
advwdt_platform_device
;
static
unsigned
long
advwdt_is_open
;
static
char
adv_expect_close
;
...
...
@@ -120,7 +121,7 @@ static ssize_t advwdt_write(struct file *file, const char __user *buf,
for
(
i
=
0
;
i
!=
count
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
i
))
if
(
get_user
(
c
,
buf
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
adv_expect_close
=
42
;
...
...
@@ -199,8 +200,7 @@ static int advwdt_open(struct inode *inode, struct file *file)
return
nonseekable_open
(
inode
,
file
);
}
static
int
advwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
advwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
adv_expect_close
==
42
)
{
advwdt_disable
();
...
...
@@ -288,9 +288,9 @@ static int __devinit advwdt_probe(struct platform_device *dev)
static
int
__devexit
advwdt_remove
(
struct
platform_device
*
dev
)
{
misc_deregister
(
&
advwdt_miscdev
);
release_region
(
wdt_start
,
1
);
if
(
wdt_stop
!=
wdt_start
)
release_region
(
wdt_stop
,
1
);
release_region
(
wdt_start
,
1
);
if
(
wdt_stop
!=
wdt_start
)
release_region
(
wdt_stop
,
1
);
return
0
;
}
...
...
@@ -315,7 +315,8 @@ static int __init advwdt_init(void)
{
int
err
;
printk
(
KERN_INFO
"WDT driver for Advantech single board computer initialising.
\n
"
);
printk
(
KERN_INFO
"WDT driver for Advantech single board computer initialising.
\n
"
);
err
=
platform_driver_register
(
&
advwdt_driver
);
if
(
err
)
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/alim1535_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -153,7 +153,7 @@ static ssize_t ali_write(struct file *file, const char __user *data,
the magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
ali_expect_release
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/alim7101_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -125,7 +125,7 @@ static void wdt_timer_ping(unsigned long data)
static
void
wdt_change
(
int
writeval
)
{
char
tmp
;
char
tmp
;
pci_read_config_byte
(
alim7101_pmu
,
ALI_7101_WDT
,
&
tmp
);
if
(
writeval
==
WDT_ENABLE
)
{
...
...
@@ -198,7 +198,7 @@ static ssize_t fop_write(struct file *file, const char __user *buf,
/* now scan */
for
(
ofs
=
0
;
ofs
!=
count
;
ofs
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
ofs
))
if
(
get_user
(
c
,
buf
+
ofs
))
return
-
EFAULT
;
if
(
c
==
'V'
)
wdt_expect_close
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/ar7_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -213,7 +213,7 @@ static int ar7_wdt_notify_sys(struct notifier_block *this,
}
static
struct
notifier_block
ar7_wdt_notifier
=
{
.
notifier_call
=
ar7_wdt_notify_sys
.
notifier_call
=
ar7_wdt_notify_sys
,
};
static
ssize_t
ar7_wdt_write
(
struct
file
*
file
,
const
char
*
data
,
...
...
@@ -230,7 +230,7 @@ static ssize_t ar7_wdt_write(struct file *file, const char *data,
expect_close
=
0
;
for
(
i
=
0
;
i
<
len
;
++
i
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
1
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/at32ap700x_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -283,7 +283,7 @@ static ssize_t at32_wdt_write(struct file *file, const char __user *data,
*/
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_release
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/eurotechwdt.c
浏览文件 @
7944d3a5
...
...
@@ -210,7 +210,7 @@ size_t count, loff_t *ppos)
for
(
i
=
0
;
i
!=
count
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
i
))
if
(
get_user
(
c
,
buf
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
eur_expect_close
=
42
;
...
...
@@ -360,10 +360,8 @@ static int eurwdt_release(struct inode *inode, struct file *file)
static
int
eurwdt_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the card off */
eurwdt_disable_timer
();
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
eurwdt_disable_timer
();
/* Turn the card off */
return
NOTIFY_DONE
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/geodewdt.c
浏览文件 @
7944d3a5
...
...
@@ -77,27 +77,24 @@ static int geodewdt_set_heartbeat(int val)
return
0
;
}
static
int
geodewdt_open
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
geodewdt_open
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
test_and_set_bit
(
WDT_FLAGS_OPEN
,
&
wdt_flags
))
return
-
EBUSY
;
if
(
test_and_set_bit
(
WDT_FLAGS_OPEN
,
&
wdt_flags
))
return
-
EBUSY
;
if
(
!
test_and_clear_bit
(
WDT_FLAGS_ORPHAN
,
&
wdt_flags
))
__module_get
(
THIS_MODULE
);
if
(
!
test_and_clear_bit
(
WDT_FLAGS_ORPHAN
,
&
wdt_flags
))
__module_get
(
THIS_MODULE
);
geodewdt_ping
();
return
nonseekable_open
(
inode
,
file
);
return
nonseekable_open
(
inode
,
file
);
}
static
int
geodewdt_release
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
geodewdt_release
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
safe_close
)
{
geodewdt_disable
();
module_put
(
THIS_MODULE
);
}
else
{
}
else
{
printk
(
KERN_CRIT
"Unexpected close - watchdog is not stopping.
\n
"
);
geodewdt_ping
();
...
...
@@ -109,11 +106,10 @@ geodewdt_release(struct inode *inode, struct file *file)
return
0
;
}
static
ssize_t
geodewdt_write
(
struct
file
*
file
,
const
char
__user
*
data
,
size_t
len
,
loff_t
*
ppos
)
static
ssize_t
geodewdt_write
(
struct
file
*
file
,
const
char
__user
*
data
,
size_t
len
,
loff_t
*
ppos
)
{
if
(
len
)
{
if
(
len
)
{
if
(
!
nowayout
)
{
size_t
i
;
safe_close
=
0
;
...
...
@@ -134,9 +130,8 @@ geodewdt_write(struct file *file, const char __user *data, size_t len,
return
len
;
}
static
int
geodewdt_ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
static
int
geodewdt_ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
void
__user
*
argp
=
(
void
__user
*
)
arg
;
int
__user
*
p
=
argp
;
...
...
@@ -147,7 +142,7 @@ geodewdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
|
WDIOF_MAGICCLOSE
,
.
firmware_version
=
1
,
.
identity
=
WATCHDOG_NAME
,
};
};
switch
(
cmd
)
{
case
WDIOC_GETSUPPORT
:
...
...
@@ -200,22 +195,21 @@ geodewdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
}
static
const
struct
file_operations
geodewdt_fops
=
{
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
.
write
=
geodewdt_write
,
.
ioctl
=
geodewdt_ioctl
,
.
open
=
geodewdt_open
,
.
release
=
geodewdt_release
,
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
.
write
=
geodewdt_write
,
.
ioctl
=
geodewdt_ioctl
,
.
open
=
geodewdt_open
,
.
release
=
geodewdt_release
,
};
static
struct
miscdevice
geodewdt_miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
"watchdog"
,
.
fops
=
&
geodewdt_fops
.
fops
=
&
geodewdt_fops
,
};
static
int
__devinit
geodewdt_probe
(
struct
platform_device
*
dev
)
static
int
__devinit
geodewdt_probe
(
struct
platform_device
*
dev
)
{
int
ret
,
timer
;
...
...
@@ -246,15 +240,13 @@ geodewdt_probe(struct platform_device *dev)
return
ret
;
}
static
int
__devexit
geodewdt_remove
(
struct
platform_device
*
dev
)
static
int
__devexit
geodewdt_remove
(
struct
platform_device
*
dev
)
{
misc_deregister
(
&
geodewdt_miscdev
);
return
0
;
}
static
void
geodewdt_shutdown
(
struct
platform_device
*
dev
)
static
void
geodewdt_shutdown
(
struct
platform_device
*
dev
)
{
geodewdt_disable
();
}
...
...
@@ -269,8 +261,7 @@ static struct platform_driver geodewdt_driver = {
},
};
static
int
__init
geodewdt_init
(
void
)
static
int
__init
geodewdt_init
(
void
)
{
int
ret
;
...
...
@@ -290,8 +281,7 @@ geodewdt_init(void)
return
ret
;
}
static
void
__exit
geodewdt_exit
(
void
)
static
void
__exit
geodewdt_exit
(
void
)
{
platform_device_unregister
(
geodewdt_platform_device
);
platform_driver_unregister
(
&
geodewdt_driver
);
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/hpwdt.c
浏览文件 @
7944d3a5
...
...
@@ -405,7 +405,7 @@ static int __devinit detect_cru_service(void)
dmi_walk
(
dmi_find_cru
);
/* if cru_rom_addr has been set then we found a CRU service */
return
((
cru_rom_addr
!=
NULL
)
?
0
:
-
ENODEV
);
return
((
cru_rom_addr
!=
NULL
)
?
0
:
-
ENODEV
);
}
/* ------------------------------------------------------------------------- */
...
...
@@ -533,7 +533,7 @@ static ssize_t hpwdt_write(struct file *file, const char __user *data,
/* scan to see whether or not we got the magic char. */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_release
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/i6300esb.c
浏览文件 @
7944d3a5
...
...
@@ -9,18 +9,18 @@
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
*
based on i810-tco.c which is in turn based on softdog.c
*
based on i810-tco.c which is in turn based on softdog.c
*
*
The timer is implemented in the following I/O controller hubs:
*
(See the intel documentation on http://developer.intel.com.)
*
6300ESB chip : document number 300641-003
* The timer is implemented in the following I/O controller hubs:
* (See the intel documentation on http://developer.intel.com.)
* 6300ESB chip : document number 300641-003
*
* 2004YYZZ Ross Biro
* Initial version 0.01
* 2004YYZZ Ross Biro
*
Version 0.02
* Version 0.02
* 20050210 David Härdeman <david@2gen.com>
*
Ported driver to kernel 2.6
*
Ported driver to kernel 2.6
*/
/*
...
...
@@ -108,7 +108,8 @@ MODULE_PARM_DESC(nowayout,
* reload register. After this the appropriate registers can be written
* to once before they need to be unlocked again.
*/
static
inline
void
esb_unlock_registers
(
void
)
{
static
inline
void
esb_unlock_registers
(
void
)
{
writeb
(
ESB_UNLOCK1
,
ESB_RELOAD_REG
);
writeb
(
ESB_UNLOCK2
,
ESB_RELOAD_REG
);
}
...
...
@@ -169,7 +170,7 @@ static int esb_timer_set_heartbeat(int time)
/* Write timer 2 */
esb_unlock_registers
();
writel
(
val
,
ESB_TIMER2_REG
);
writel
(
val
,
ESB_TIMER2_REG
);
/* Reload */
esb_unlock_registers
();
...
...
@@ -196,7 +197,7 @@ static int esb_timer_read(void)
}
/*
*
/dev/watchdog handling
* /dev/watchdog handling
*/
static
int
esb_open
(
struct
inode
*
inode
,
struct
file
*
file
)
...
...
@@ -242,7 +243,7 @@ static ssize_t esb_write(struct file *file, const char __user *data,
/* scan to see whether or not we got the magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
esb_expect_close
=
42
;
...
...
@@ -262,11 +263,11 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
void
__user
*
argp
=
(
void
__user
*
)
arg
;
int
__user
*
p
=
argp
;
static
struct
watchdog_info
ident
=
{
.
options
=
WDIOF_SETTIMEOUT
|
.
options
=
WDIOF_SETTIMEOUT
|
WDIOF_KEEPALIVEPING
|
WDIOF_MAGICCLOSE
,
.
firmware_version
=
0
,
.
identity
=
ESB_MODULE_NAME
,
.
firmware_version
=
0
,
.
identity
=
ESB_MODULE_NAME
,
};
switch
(
cmd
)
{
...
...
@@ -324,10 +325,9 @@ static long esb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static
int
esb_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the WDT off */
esb_timer_stop
();
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
esb_timer_stop
();
/* Turn the WDT off */
return
NOTIFY_DONE
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/iTCO_vendor_support.c
浏览文件 @
7944d3a5
...
...
@@ -18,9 +18,9 @@
*/
/* Module and version information */
#define DRV_NAME
"iTCO_vendor_support"
#define DRV_VERSION
"1.01"
#define DRV_RELDATE
"11-Nov-2006"
#define DRV_NAME
"iTCO_vendor_support"
#define DRV_VERSION
"1.01"
#define DRV_RELDATE
"11-Nov-2006"
#define PFX DRV_NAME ": "
/* Includes */
...
...
@@ -37,8 +37,8 @@
/* iTCO defines */
#define SMI_EN acpibase + 0x30
/* SMI Control and Enable Register */
#define TCOBASE acpibase + 0x60
/* TCO base address
*/
#define TCO1_STS TCOBASE + 0x04
/* TCO1 Status Register
*/
#define TCOBASE acpibase + 0x60
/* TCO base address
*/
#define TCO1_STS TCOBASE + 0x04
/* TCO1 Status Register
*/
/* List of vendor support modes */
/* SuperMicro Pentium 3 Era 370SSE+-OEM1/P3TSSE */
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/iTCO_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -55,9 +55,9 @@
*/
/* Module and version information */
#define DRV_NAME
"iTCO_wdt"
#define DRV_VERSION
"1.03"
#define DRV_RELDATE
"30-Apr-2008"
#define DRV_NAME
"iTCO_wdt"
#define DRV_VERSION
"1.03"
#define DRV_RELDATE
"30-Apr-2008"
#define PFX DRV_NAME ": "
/* Includes */
...
...
@@ -107,7 +107,7 @@ enum iTCO_chipsets {
TCO_ICH9
,
/* ICH9 */
TCO_ICH9R
,
/* ICH9R */
TCO_ICH9DH
,
/* ICH9DH */
TCO_ICH9DO
,
/* ICH9DO */
TCO_ICH9DO
,
/* ICH9DO */
TCO_631XESB
,
/* 631xESB/632xESB */
};
...
...
@@ -497,7 +497,7 @@ static ssize_t iTCO_wdt_write(struct file *file, const char __user *data,
magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_release
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/ib700wdt.c
浏览文件 @
7944d3a5
...
...
@@ -129,8 +129,7 @@ MODULE_PARM_DESC(nowayout,
* Watchdog Operations
*/
static
void
ibwdt_ping
(
void
)
static
void
ibwdt_ping
(
void
)
{
spin_lock
(
&
ibwdt_lock
);
...
...
@@ -140,16 +139,14 @@ ibwdt_ping(void)
spin_unlock
(
&
ibwdt_lock
);
}
static
void
ibwdt_disable
(
void
)
static
void
ibwdt_disable
(
void
)
{
spin_lock
(
&
ibwdt_lock
);
outb_p
(
0
,
WDT_STOP
);
spin_unlock
(
&
ibwdt_lock
);
}
static
int
ibwdt_set_heartbeat
(
int
t
)
static
int
ibwdt_set_heartbeat
(
int
t
)
{
int
i
;
...
...
@@ -263,8 +260,7 @@ static int ibwdt_open(struct inode *inode, struct file *file)
return
nonseekable_open
(
inode
,
file
);
}
static
int
ibwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
ibwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
expect_close
==
42
)
{
ibwdt_disable
();
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/ibmasr.c
浏览文件 @
7944d3a5
...
...
@@ -275,7 +275,7 @@ static long asr_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static
const
struct
watchdog_info
ident
=
{
.
options
=
WDIOF_KEEPALIVEPING
|
WDIOF_MAGICCLOSE
,
.
identity
=
"IBM ASR"
.
identity
=
"IBM ASR"
,
};
void
__user
*
argp
=
(
void
__user
*
)
arg
;
int
__user
*
p
=
argp
;
...
...
@@ -345,7 +345,7 @@ static int asr_release(struct inode *inode, struct file *file)
static
const
struct
file_operations
asr_fops
=
{
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
.
llseek
=
no_llseek
,
.
write
=
asr_write
,
.
unlocked_ioctl
=
asr_ioctl
,
.
open
=
asr_open
,
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/iop_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -241,7 +241,7 @@ static int __init iop_wdt_init(void)
with an open */
ret
=
misc_register
(
&
iop_wdt_miscdev
);
if
(
ret
==
0
)
printk
(
"iop watchdog timer: timeout %lu sec
\n
"
,
printk
(
KERN_INFO
"iop watchdog timer: timeout %lu sec
\n
"
,
iop_watchdog_timeout
());
return
ret
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/it8712f_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -221,7 +221,7 @@ static ssize_t it8712f_wdt_write(struct file *file, const char __user *data,
expect_close
=
0
;
for
(
i
=
0
;
i
<
len
;
++
i
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/ixp4xx_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -157,8 +157,7 @@ static int ixp4xx_wdt_release(struct inode *inode, struct file *file)
}
static
const
struct
file_operations
ixp4xx_wdt_fops
=
{
static
const
struct
file_operations
ixp4xx_wdt_fops
=
{
.
owner
=
THIS_MODULE
,
.
llseek
=
no_llseek
,
.
write
=
ixp4xx_wdt_write
,
...
...
@@ -167,8 +166,7 @@ static const struct file_operations ixp4xx_wdt_fops =
.
release
=
ixp4xx_wdt_release
,
};
static
struct
miscdevice
ixp4xx_wdt_miscdev
=
{
static
struct
miscdevice
ixp4xx_wdt_miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
"watchdog"
,
.
fops
=
&
ixp4xx_wdt_fops
,
...
...
@@ -181,8 +179,8 @@ static int __init ixp4xx_wdt_init(void)
asm
(
"mrc p15, 0, %0, cr0, cr0, 0;"
:
"=r"
(
processor_id
)
:
);
if
(
!
(
processor_id
&
0xf
)
&&
!
cpu_is_ixp46x
())
{
printk
(
"IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected -
"
"watchdog disabled
\n
"
);
printk
(
KERN_ERR
"IXP4XXX Watchdog: Rev. A0 IXP42x CPU detected
"
"
-
watchdog disabled
\n
"
);
return
-
ENODEV
;
}
...
...
@@ -191,7 +189,8 @@ static int __init ixp4xx_wdt_init(void)
WDIOF_CARDRESET
:
0
;
ret
=
misc_register
(
&
ixp4xx_wdt_miscdev
);
if
(
ret
==
0
)
printk
(
"IXP4xx Watchdog Timer: heartbeat %d sec
\n
"
,
heartbeat
);
printk
(
KERN_INFO
"IXP4xx Watchdog Timer: heartbeat %d sec
\n
"
,
heartbeat
);
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/mpc5200_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -164,7 +164,7 @@ static int mpc5200_wdt_release(struct inode *inode, struct file *file)
static
const
struct
file_operations
mpc5200_wdt_fops
=
{
.
owner
=
THIS_MODULE
,
.
write
=
mpc5200_wdt_write
,
.
ioctl
=
mpc5200_wdt_ioctl
,
.
unlocked_
ioctl
=
mpc5200_wdt_ioctl
,
.
open
=
mpc5200_wdt_open
,
.
release
=
mpc5200_wdt_release
,
};
...
...
@@ -219,9 +219,9 @@ static int mpc5200_wdt_probe(struct of_device *op,
return
0
;
iounmap
(
wdt
->
regs
);
out_release:
out_release:
release_mem_region
(
wdt
->
mem
.
start
,
size
);
out_free:
out_free:
kfree
(
wdt
);
return
err
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/mpcore_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -377,13 +377,13 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
return
0
;
err_irq:
err_irq:
misc_deregister
(
&
mpcore_wdt_miscdev
);
err_misc:
err_misc:
iounmap
(
wdt
->
base
);
err_free:
err_free:
kfree
(
wdt
);
err_out:
err_out:
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/mtx-1_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -191,14 +191,14 @@ static const struct file_operations mtx1_wdt_fops = {
.
unlocked_ioctl
=
mtx1_wdt_ioctl
,
.
open
=
mtx1_wdt_open
,
.
write
=
mtx1_wdt_write
,
.
release
=
mtx1_wdt_release
.
release
=
mtx1_wdt_release
,
};
static
struct
miscdevice
mtx1_wdt_misc
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
"watchdog"
,
.
fops
=
&
mtx1_wdt_fops
.
fops
=
&
mtx1_wdt_fops
,
};
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/omap_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -245,7 +245,7 @@ static const struct file_operations omap_wdt_fops = {
static
struct
miscdevice
omap_wdt_miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
"watchdog"
,
.
fops
=
&
omap_wdt_fops
.
fops
=
&
omap_wdt_fops
,
};
static
int
__init
omap_wdt_probe
(
struct
platform_device
*
pdev
)
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/pc87413_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -38,7 +38,7 @@
/* #define DEBUG 1 */
#define DEFAULT_TIMEOUT 1
/* 1 minute */
#define DEFAULT_TIMEOUT 1
/* 1 minute */
#define MAX_TIMEOUT 255
#define VERSION "1.1"
...
...
@@ -46,17 +46,17 @@
#define PFX MODNAME ": "
#define DPFX MODNAME " - DEBUG: "
#define WDT_INDEX_IO_PORT (io+0)
/* I/O port base (index register) */
#define WDT_INDEX_IO_PORT (io+0)
/* I/O port base (index register) */
#define WDT_DATA_IO_PORT (WDT_INDEX_IO_PORT+1)
#define SWC_LDN 0x04
#define SIOCFG2 0x22
/* Serial IO register */
#define WDCTL 0x10
/* Watchdog-Timer-Controll-Register */
#define WDTO 0x11
/* Watchdog timeout register */
#define WDCFG 0x12
/* Watchdog config register */
#define SIOCFG2 0x22
/* Serial IO register */
#define WDCTL 0x10
/* Watchdog-Timer-Controll-Register */
#define WDTO 0x11
/* Watchdog timeout register */
#define WDCFG 0x12
/* Watchdog config register */
static
int
io
=
0x2E
;
/* Address used on Portwell Boards */
static
int
io
=
0x2E
;
/* Address used on Portwell Boards */
static
int
timeout
=
DEFAULT_TIMEOUT
;
/* timeout value */
static
int
timeout
=
DEFAULT_TIMEOUT
;
/* timeout value */
static
unsigned
long
timer_enabled
;
/* is the timer enabled? */
static
char
expect_close
;
/* is the close expected? */
...
...
@@ -99,14 +99,14 @@ static inline void pc87413_enable_swc(void)
/* Step 2: Enable SWC functions */
outb_p
(
0x07
,
WDT_INDEX_IO_PORT
);
/* Point SWC_LDN (LDN=4) */
outb_p
(
0x07
,
WDT_INDEX_IO_PORT
);
/* Point SWC_LDN (LDN=4) */
outb_p
(
SWC_LDN
,
WDT_DATA_IO_PORT
);
outb_p
(
0x30
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x30 First */
outb_p
(
0x30
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x30 First */
cr_data
=
inb
(
WDT_DATA_IO_PORT
);
cr_data
|=
0x01
;
/* Set Bit0 to 1 */
cr_data
|=
0x01
;
/* Set Bit0 to 1 */
outb_p
(
0x30
,
WDT_INDEX_IO_PORT
);
outb_p
(
cr_data
,
WDT_DATA_IO_PORT
);
/* Index0x30_bit0P1 */
outb_p
(
cr_data
,
WDT_DATA_IO_PORT
);
/* Index0x30_bit0P1 */
#ifdef DEBUG
printk
(
KERN_INFO
DPFX
"pc87413 - Enable SWC functions
\n
"
);
...
...
@@ -122,10 +122,10 @@ static inline unsigned int pc87413_get_swc_base(void)
/* Step 3: Read SWC I/O Base Address */
outb_p
(
0x60
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x60 */
outb_p
(
0x60
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x60 */
addr_h
=
inb
(
WDT_DATA_IO_PORT
);
outb_p
(
0x61
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x61 */
outb_p
(
0x61
,
WDT_INDEX_IO_PORT
);
/* Read Index 0x61 */
addr_l
=
inb
(
WDT_DATA_IO_PORT
);
...
...
@@ -374,7 +374,7 @@ static ssize_t pc87413_write(struct file *file, const char __user *data,
magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
@@ -413,7 +413,7 @@ static long pc87413_ioctl(struct file *file, unsigned int cmd,
WDIOF_SETTIMEOUT
|
WDIOF_MAGICCLOSE
,
.
firmware_version
=
1
,
.
identity
=
"PC87413(HF/F) watchdog"
.
identity
=
"PC87413(HF/F) watchdog"
,
};
uarg
.
i
=
(
int
__user
*
)
arg
;
...
...
@@ -507,7 +507,7 @@ static struct notifier_block pc87413_notifier = {
static
struct
miscdevice
pc87413_miscdev
=
{
.
minor
=
WATCHDOG_MINOR
,
.
name
=
"watchdog"
,
.
fops
=
&
pc87413_fops
.
fops
=
&
pc87413_fops
,
};
/* -- Module init functions -------------------------------------*/
...
...
@@ -567,9 +567,9 @@ static void __exit pc87413_exit(void)
misc_deregister
(
&
pc87413_miscdev
);
unregister_reboot_notifier
(
&
pc87413_notifier
);
/* release_region(io,2); */
/* release_region(io,
2); */
printk
(
MODNAME
" watchdog component driver removed.
\n
"
);
printk
(
KERN_INFO
MODNAME
" watchdog component driver removed.
\n
"
);
}
module_init
(
pc87413_init
);
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/pcwd.c
浏览文件 @
7944d3a5
...
...
@@ -145,7 +145,7 @@ static int pcwd_ioports[] = { 0x270, 0x350, 0x370, 0x000 };
#define CMD_ISA_RESET_RELAYS 0x0D
/* Watchdog's Dip Switch heartbeat values */
static
const
int
heartbeat_tbl
[]
=
{
static
const
int
heartbeat_tbl
[]
=
{
20
,
/* OFF-OFF-OFF = 20 Sec */
40
,
/* OFF-OFF-ON = 40 Sec */
60
,
/* OFF-ON-OFF = 1 Min */
...
...
@@ -272,7 +272,7 @@ static int set_command_mode(void)
printk
(
KERN_DEBUG
PFX
"command_mode=%d
\n
"
,
pcwd_private
.
command_mode
);
return
(
found
)
;
return
found
;
}
static
void
unset_command_mode
(
void
)
...
...
@@ -325,7 +325,7 @@ static inline int pcwd_get_option_switches(void)
}
unset_command_mode
();
return
(
option_switches
)
;
return
option_switches
;
}
static
void
pcwd_show_card_info
(
void
)
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/pcwd_pci.c
浏览文件 @
7944d3a5
...
...
@@ -96,7 +96,7 @@
#define CMD_GET_CLEAR_RESET_COUNT 0x84
/* Watchdog's Dip Switch heartbeat values */
static
const
int
heartbeat_tbl
[]
=
{
static
const
int
heartbeat_tbl
[]
=
{
5
,
/* OFF-OFF-OFF = 5 Sec */
10
,
/* OFF-OFF-ON = 10 Sec */
30
,
/* OFF-ON-OFF = 30 Sec */
...
...
@@ -219,11 +219,10 @@ static void pcipcwd_show_card_info(void)
int
option_switches
;
got_fw_rev
=
send_command
(
CMD_GET_FIRMWARE_VERSION
,
&
fw_rev_major
,
&
fw_rev_minor
);
if
(
got_fw_rev
)
{
if
(
got_fw_rev
)
sprintf
(
fw_ver_str
,
"%u.%02u"
,
fw_rev_major
,
fw_rev_minor
);
}
else
{
else
sprintf
(
fw_ver_str
,
"<card no answer>"
);
}
/* Get switch settings */
option_switches
=
pcipcwd_get_option_switches
();
...
...
@@ -330,7 +329,7 @@ static int pcipcwd_get_status(int *status)
{
int
control_status
;
*
status
=
0
;
*
status
=
0
;
control_status
=
inb_p
(
pcipcwd_private
.
io_addr
+
1
);
if
(
control_status
&
WD_PCI_WTRP
)
*
status
|=
WDIOF_CARDRESET
;
...
...
@@ -368,8 +367,8 @@ static int pcipcwd_clear_status(void)
outb_p
((
control_status
&
WD_PCI_R2DS
)
|
WD_PCI_WTRP
,
pcipcwd_private
.
io_addr
+
1
);
/* clear reset counter */
msb
=
0
;
reset_counter
=
0xff
;
msb
=
0
;
reset_counter
=
0xff
;
send_command
(
CMD_GET_CLEAR_RESET_COUNT
,
&
msb
,
&
reset_counter
);
if
(
debug
>=
DEBUG
)
{
...
...
@@ -441,7 +440,7 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data,
/* scan to see whether or not we got the magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_release
=
42
;
...
...
@@ -471,8 +470,7 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
switch
(
cmd
)
{
case
WDIOC_GETSUPPORT
:
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
case
WDIOC_GETSTATUS
:
{
...
...
@@ -498,7 +496,7 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
{
int
new_options
,
retval
=
-
EINVAL
;
if
(
get_user
(
new_options
,
p
))
if
(
get_user
(
new_options
,
p
))
return
-
EFAULT
;
if
(
new_options
&
WDIOS_DISABLECARD
)
{
...
...
@@ -600,7 +598,7 @@ static ssize_t pcipcwd_temp_read(struct file *file, char __user *data,
if
(
pcipcwd_get_temperature
(
&
temperature
))
return
-
EFAULT
;
if
(
copy_to_user
(
data
,
&
temperature
,
1
))
if
(
copy_to_user
(
data
,
&
temperature
,
1
))
return
-
EFAULT
;
return
1
;
...
...
@@ -625,10 +623,8 @@ static int pcipcwd_temp_release(struct inode *inode, struct file *file)
static
int
pcipcwd_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the WDT off */
pcipcwd_stop
();
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
pcipcwd_stop
();
/* Turn the WDT off */
return
NOTIFY_DONE
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/pcwd_usb.c
浏览文件 @
7944d3a5
...
...
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" _
#define USB_PCWD_PRODUCT_ID 0x1140
/* table of devices that work with this driver */
static
struct
usb_device_id
usb_pcwd_table
[]
=
{
static
struct
usb_device_id
usb_pcwd_table
[]
=
{
{
USB_DEVICE
(
USB_PCWD_VENDOR_ID
,
USB_PCWD_PRODUCT_ID
)
},
{
}
/* Terminating entry */
};
...
...
@@ -109,7 +109,7 @@ MODULE_DEVICE_TABLE (usb, usb_pcwd_table);
#define CMD_DISABLE_WATCHDOG CMD_ENABLE_WATCHDOG
/* Watchdog's Dip Switch heartbeat values */
static
const
int
heartbeat_tbl
[]
=
{
static
const
int
heartbeat_tbl
[]
=
{
5
,
/* OFF-OFF-OFF = 5 Sec */
10
,
/* OFF-OFF-ON = 10 Sec */
30
,
/* OFF-ON-OFF = 30 Sec */
...
...
@@ -129,15 +129,15 @@ static char expect_release;
/* Structure to hold all of our device specific stuff */
struct
usb_pcwd_private
{
struct
usb_device
*
udev
;
/* save off the usb device pointer */
struct
usb_interface
*
interface
;
/* the interface for this device */
struct
usb_device
*
udev
;
/* save off the usb device pointer */
struct
usb_interface
*
interface
;
/* the interface for this device */
unsigned
int
interface_number
;
/* the interface number used for cmd's */
unsigned
char
*
intr_buffer
;
/* the buffer to intr data */
unsigned
char
*
intr_buffer
;
/* the buffer to intr data */
dma_addr_t
intr_dma
;
/* the dma address for the intr buffer */
size_t
intr_size
;
/* the size of the intr buffer */
struct
urb
*
intr_urb
;
/* the urb used for the intr pipe */
struct
urb
*
intr_urb
;
/* the urb used for the intr pipe */
unsigned
char
cmd_command
;
/* The command that is reported back */
unsigned
char
cmd_data_msb
;
/* The data MSB that is reported back */
...
...
@@ -153,8 +153,8 @@ static struct usb_pcwd_private *usb_pcwd_device;
static
DEFINE_MUTEX
(
disconnect_mutex
);
/* local function prototypes */
static
int
usb_pcwd_probe
(
struct
usb_interface
*
interface
,
const
struct
usb_device_id
*
id
);
static
void
usb_pcwd_disconnect
(
struct
usb_interface
*
interface
);
static
int
usb_pcwd_probe
(
struct
usb_interface
*
interface
,
const
struct
usb_device_id
*
id
);
static
void
usb_pcwd_disconnect
(
struct
usb_interface
*
interface
);
/* usb specific object needed to register this driver with the usb subsystem */
static
struct
usb_driver
usb_pcwd_driver
=
{
...
...
@@ -194,10 +194,10 @@ static void usb_pcwd_intr_done(struct urb *urb)
usb_pcwd
->
cmd_data_lsb
=
data
[
2
];
/* notify anyone waiting that the cmd has finished */
atomic_set
(
&
usb_pcwd
->
cmd_received
,
1
);
atomic_set
(
&
usb_pcwd
->
cmd_received
,
1
);
resubmit:
retval
=
usb_submit_urb
(
urb
,
GFP_ATOMIC
);
retval
=
usb_submit_urb
(
urb
,
GFP_ATOMIC
);
if
(
retval
)
printk
(
KERN_ERR
PFX
"can't resubmit intr, usb_submit_urb failed with result %d
\n
"
,
retval
);
...
...
@@ -223,7 +223,7 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd, unsigned cha
dbg
(
"sending following data cmd=0x%02x msb=0x%02x lsb=0x%02x"
,
buf
[
0
],
buf
[
1
],
buf
[
2
]);
atomic_set
(
&
usb_pcwd
->
cmd_received
,
0
);
atomic_set
(
&
usb_pcwd
->
cmd_received
,
0
);
if
(
usb_control_msg
(
usb_pcwd
->
udev
,
usb_sndctrlpipe
(
usb_pcwd
->
udev
,
0
),
HID_REQ_SET_REPORT
,
HID_DT_REPORT
,
...
...
@@ -236,7 +236,7 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd, unsigned cha
got_response
=
0
;
for
(
count
=
0
;
(
count
<
USB_COMMAND_TIMEOUT
)
&&
(
!
got_response
);
count
++
)
{
mdelay
(
1
);
if
(
atomic_read
(
&
usb_pcwd
->
cmd_received
))
if
(
atomic_read
(
&
usb_pcwd
->
cmd_received
))
got_response
=
1
;
}
...
...
@@ -355,7 +355,7 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,
/* scan to see whether or not we got the magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_release
=
42
;
...
...
@@ -383,8 +383,7 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
switch
(
cmd
)
{
case
WDIOC_GETSUPPORT
:
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
case
WDIOC_GETSTATUS
:
case
WDIOC_GETBOOTSTATUS
:
...
...
@@ -404,7 +403,7 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
{
int
new_options
,
retval
=
-
EINVAL
;
if
(
get_user
(
new_options
,
p
))
if
(
get_user
(
new_options
,
p
))
return
-
EFAULT
;
if
(
new_options
&
WDIOS_DISABLECARD
)
{
...
...
@@ -518,10 +517,8 @@ static int usb_pcwd_temperature_release(struct inode *inode, struct file *file)
static
int
usb_pcwd_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the WDT off */
usb_pcwd_stop
(
usb_pcwd_device
);
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
usb_pcwd_stop
(
usb_pcwd_device
);
/* Turn the WDT off */
return
NOTIFY_DONE
;
}
...
...
@@ -566,13 +563,13 @@ static struct notifier_block usb_pcwd_notifier = {
/**
* usb_pcwd_delete
*/
static
inline
void
usb_pcwd_delete
(
struct
usb_pcwd_private
*
usb_pcwd
)
static
inline
void
usb_pcwd_delete
(
struct
usb_pcwd_private
*
usb_pcwd
)
{
usb_free_urb
(
usb_pcwd
->
intr_urb
);
if
(
usb_pcwd
->
intr_buffer
!=
NULL
)
usb_buffer_free
(
usb_pcwd
->
udev
,
usb_pcwd
->
intr_size
,
usb_pcwd
->
intr_buffer
,
usb_pcwd
->
intr_dma
);
kfree
(
usb_pcwd
);
kfree
(
usb_pcwd
);
}
/**
...
...
@@ -625,7 +622,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
maxp
=
usb_maxpacket
(
udev
,
pipe
,
usb_pipeout
(
pipe
));
/* allocate memory for our device and initialize it */
usb_pcwd
=
kzalloc
(
sizeof
(
struct
usb_pcwd_private
),
GFP_KERNEL
);
usb_pcwd
=
kzalloc
(
sizeof
(
struct
usb_pcwd_private
),
GFP_KERNEL
);
if
(
usb_pcwd
==
NULL
)
{
printk
(
KERN_ERR
PFX
"Out of memory
\n
"
);
goto
error
;
...
...
@@ -640,7 +637,8 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
usb_pcwd
->
intr_size
=
(
le16_to_cpu
(
endpoint
->
wMaxPacketSize
)
>
8
?
le16_to_cpu
(
endpoint
->
wMaxPacketSize
)
:
8
);
/* set up the memory buffer's */
if
(
!
(
usb_pcwd
->
intr_buffer
=
usb_buffer_alloc
(
udev
,
usb_pcwd
->
intr_size
,
GFP_ATOMIC
,
&
usb_pcwd
->
intr_dma
)))
{
usb_pcwd
->
intr_buffer
=
usb_buffer_alloc
(
udev
,
usb_pcwd
->
intr_size
,
GFP_ATOMIC
,
&
usb_pcwd
->
intr_dma
);
if
(
!
usb_pcwd
->
intr_buffer
)
{
printk
(
KERN_ERR
PFX
"Out of memory
\n
"
);
goto
error
;
}
...
...
@@ -674,11 +672,10 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
/* Get the Firmware Version */
got_fw_rev
=
usb_pcwd_send_command
(
usb_pcwd
,
CMD_GET_FIRMWARE_VERSION
,
&
fw_rev_major
,
&
fw_rev_minor
);
if
(
got_fw_rev
)
{
if
(
got_fw_rev
)
sprintf
(
fw_ver_str
,
"%u.%02u"
,
fw_rev_major
,
fw_rev_minor
);
}
else
{
else
sprintf
(
fw_ver_str
,
"<card no answer>"
);
}
printk
(
KERN_INFO
PFX
"Found card (Firmware: %s) with temp option
\n
"
,
fw_ver_str
);
...
...
@@ -724,7 +721,7 @@ static int usb_pcwd_probe(struct usb_interface *interface, const struct usb_devi
}
/* we can register the device now, as it is ready */
usb_set_intfdata
(
interface
,
usb_pcwd
);
usb_set_intfdata
(
interface
,
usb_pcwd
);
printk
(
KERN_INFO
PFX
"initialized. heartbeat=%d sec (nowayout=%d)
\n
"
,
heartbeat
,
nowayout
);
...
...
@@ -758,8 +755,8 @@ static void usb_pcwd_disconnect(struct usb_interface *interface)
/* prevent races with open() */
mutex_lock
(
&
disconnect_mutex
);
usb_pcwd
=
usb_get_intfdata
(
interface
);
usb_set_intfdata
(
interface
,
NULL
);
usb_pcwd
=
usb_get_intfdata
(
interface
);
usb_set_intfdata
(
interface
,
NULL
);
mutex_lock
(
&
usb_pcwd
->
mtx
);
...
...
@@ -819,5 +816,5 @@ static void __exit usb_pcwd_exit(void)
}
module_init
(
usb_pcwd_init
);
module_exit
(
usb_pcwd_exit
);
module_init
(
usb_pcwd_init
);
module_exit
(
usb_pcwd_exit
);
This diff is collapsed.
Click to expand it.
drivers/watchdog/rm9k_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -234,8 +234,8 @@ static int wdt_gpi_release(struct inode *inode, struct file *file)
return
0
;
}
static
ssize_t
wdt_gpi_write
(
struct
file
*
f
,
const
char
__user
*
d
,
size_t
s
,
loff_t
*
o
)
static
ssize_t
wdt_gpi_write
(
struct
file
*
f
,
const
char
__user
*
d
,
size_t
s
,
loff_t
*
o
)
{
char
val
;
...
...
@@ -325,8 +325,8 @@ static long wdt_gpi_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
/* Shutdown notifier */
static
int
wdt_gpi_notify
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
static
int
wdt_gpi_notify
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
wdt_gpi_stop
();
...
...
@@ -336,9 +336,8 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
/* Init & exit procedures */
static
const
struct
resource
*
wdt_gpi_get_resource
(
struct
platform_device
*
pdv
,
const
char
*
name
,
unsigned
int
type
)
static
const
struct
resource
*
wdt_gpi_get_resource
(
struct
platform_device
*
pdv
,
const
char
*
name
,
unsigned
int
type
)
{
char
buf
[
80
];
if
(
snprintf
(
buf
,
sizeof
buf
,
"%s_0"
,
name
)
>=
sizeof
buf
)
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/sb_wdog.c
浏览文件 @
7944d3a5
...
...
@@ -215,8 +215,8 @@ static long sbwdog_ioctl(struct file *file, unsigned int cmd,
/*
* Notifier for system down
*/
static
int
sbwdog_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
erf
)
static
int
sbwdog_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
erf
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/*
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/sbc60xxwdt.c
浏览文件 @
7944d3a5
...
...
@@ -183,7 +183,7 @@ static ssize_t fop_write(struct file *file, const char __user *buf,
magic character */
for
(
ofs
=
0
;
ofs
!=
count
;
ofs
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
ofs
))
if
(
get_user
(
c
,
buf
+
ofs
))
return
-
EFAULT
;
if
(
c
==
'V'
)
wdt_expect_close
=
42
;
...
...
@@ -238,7 +238,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
switch
(
cmd
)
{
case
WDIOC_GETSUPPORT
:
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
return
copy_to_user
(
argp
,
&
ident
,
sizeof
(
ident
))
?
-
EFAULT
:
0
;
case
WDIOC_GETSTATUS
:
case
WDIOC_GETBOOTSTATUS
:
return
put_user
(
0
,
p
);
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/sc1200wdt.c
浏览文件 @
7944d3a5
...
...
@@ -279,7 +279,7 @@ static ssize_t sc1200wdt_write(struct file *file, const char __user *data,
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/scx200_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -143,7 +143,7 @@ static ssize_t scx200_wdt_write(struct file *file, const char __user *data,
expect_close
=
0
;
for
(
i
=
0
;
i
<
len
;
++
i
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/smsc37b787_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -408,7 +408,7 @@ static ssize_t wb_smsc_wdt_write(struct file *file, const char __user *data,
magic character */
for
(
i
=
0
;
i
!=
len
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
data
+
i
))
if
(
get_user
(
c
,
data
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
@@ -438,7 +438,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
WDIOF_SETTIMEOUT
|
WDIOF_MAGICCLOSE
,
.
firmware_version
=
0
,
.
identity
=
"SMsC 37B787 Watchdog"
.
identity
=
"SMsC 37B787 Watchdog"
,
};
uarg
.
i
=
(
int
__user
*
)
arg
;
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/txx9wdt.c
浏览文件 @
7944d3a5
...
...
@@ -190,7 +190,7 @@ static struct miscdevice txx9wdt_miscdev = {
};
static
struct
notifier_block
txx9wdt_notifier
=
{
.
notifier_call
=
txx9wdt_notify_sys
.
notifier_call
=
txx9wdt_notify_sys
,
};
static
int
__init
txx9wdt_probe
(
struct
platform_device
*
dev
)
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/w83627hf_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -180,7 +180,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,
for
(
i
=
0
;
i
!=
count
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
i
))
if
(
get_user
(
c
,
buf
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
@@ -278,10 +278,9 @@ static int wdt_close(struct inode *inode, struct file *file)
static
int
wdt_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the WDT off */
wdt_disable
();
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
wdt_disable
();
/* Turn the WDT off */
return
NOTIFY_DONE
;
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/w83697hf_wdt.c
浏览文件 @
7944d3a5
...
...
@@ -218,7 +218,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,
for
(
i
=
0
;
i
!=
count
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
i
))
if
(
get_user
(
c
,
buf
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
@@ -325,10 +325,9 @@ static int wdt_close(struct inode *inode, struct file *file)
static
int
wdt_notify_sys
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
unused
)
{
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
{
/* Turn the WDT off */
wdt_disable
();
}
if
(
code
==
SYS_DOWN
||
code
==
SYS_HALT
)
wdt_disable
();
/* Turn the WDT off */
return
NOTIFY_DONE
;
}
...
...
@@ -414,7 +413,7 @@ static int __init wdt_init(void)
w83697hf_init
();
if
(
early_disable
)
{
if
(
wdt_running
())
printk
(
KERN_WARNING
PFX
"Stopping previously enabled watchdog until userland kicks in
\n
"
);
printk
(
KERN_WARNING
PFX
"Stopping previously enabled watchdog until userland kicks in
\n
"
);
wdt_disable
();
}
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/wafer5823wdt.c
浏览文件 @
7944d3a5
/*
* ICP Wafer 5823 Single Board Computer WDT driver
*
http://www.icpamerica.com/wafer_5823.php
*
May also work on other similar models
*
http://www.icpamerica.com/wafer_5823.php
*
May also work on other similar models
*
* (c) Copyright 2002 Justin Cormack <justin@street-vision.com>
*
*
Release 0.02
*
Release 0.02
*
* Based on advantechwdt.c which is based on wdt.c.
* Original copyright messages:
...
...
@@ -50,10 +50,10 @@ static DEFINE_SPINLOCK(wafwdt_lock);
/*
* You must set these - there is no sane way to probe for this board.
*
*
To enable, write the timeout value in seconds (1 to 255) to I/O
*
port WDT_START, then read the port to start the watchdog. To pat
*
the dog, read port WDT_STOP to stop the timer, then read WDT_START
*
to restart it again.
*
To enable, write the timeout value in seconds (1 to 255) to I/O
*
port WDT_START, then read the port to start the watchdog. To pat
*
the dog, read port WDT_STOP to stop the timer, then read WDT_START
*
to restart it again.
*/
static
int
wdt_stop
=
0x843
;
...
...
@@ -87,8 +87,7 @@ static void wafwdt_start(void)
inb_p
(
wdt_start
);
}
static
void
wafwdt_stop
(
void
)
static
void
wafwdt_stop
(
void
)
{
/* stop watchdog */
inb_p
(
wdt_stop
);
...
...
@@ -199,8 +198,7 @@ static int wafwdt_open(struct inode *inode, struct file *file)
return
nonseekable_open
(
inode
,
file
);
}
static
int
wafwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
static
int
wafwdt_close
(
struct
inode
*
inode
,
struct
file
*
file
)
{
if
(
expect_close
==
42
)
wafwdt_stop
();
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/wd501p.h
浏览文件 @
7944d3a5
...
...
@@ -12,7 +12,7 @@
* http://www.cymru.net
*
* This driver is provided under the GNU General Public License, incorporated
* herein by reference. The driver is provided without warranty or
* herein by reference. The driver is provided without warranty or
* support.
*
* Release 0.04.
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/wdrtas.c
浏览文件 @
7944d3a5
...
...
@@ -313,7 +313,7 @@ static long wdrtas_ioctl(struct file *file, unsigned int cmd,
static
struct
watchdog_info
wdinfo
=
{
.
options
=
WDRTAS_SUPPORTED_MASK
,
.
firmware_version
=
0
,
.
identity
=
"wdrtas"
.
identity
=
"wdrtas"
,
};
switch
(
cmd
)
{
...
...
This diff is collapsed.
Click to expand it.
drivers/watchdog/wdt_pci.c
浏览文件 @
7944d3a5
...
...
@@ -381,7 +381,7 @@ static ssize_t wdtpci_write(struct file *file, const char __user *buf,
for
(
i
=
0
;
i
!=
count
;
i
++
)
{
char
c
;
if
(
get_user
(
c
,
buf
+
i
))
if
(
get_user
(
c
,
buf
+
i
))
return
-
EFAULT
;
if
(
c
==
'V'
)
expect_close
=
42
;
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部