git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
sc1200wdt.c
diff --git
a/drivers/char/watchdog/sc1200wdt.c
b/drivers/char/watchdog/sc1200wdt.c
index
9ddebae
..
20b88f9
100644
(file)
--- a/
drivers/char/watchdog/sc1200wdt.c
+++ b/
drivers/char/watchdog/sc1200wdt.c
@@
-74,9
+74,9
@@
static char banner[] __initdata = KERN_INFO PFX SC1200_MODULE_VER;
static int timeout = 1;
static int io = -1;
static int io_len = 2; /* for non plug and play */
static int timeout = 1;
static int io = -1;
static int io_len = 2; /* for non plug and play */
-struct semaphore open_sem;
+st
atic st
ruct semaphore open_sem;
static char expect_close;
static char expect_close;
-s
pinlock_t sc1200wdt_lock;
/* io port access serialisation */
+s
tatic spinlock_t sc1200wdt_lock;
/* io port access serialisation */
#if defined CONFIG_PNP
static int isapnp = 1;
#if defined CONFIG_PNP
static int isapnp = 1;
@@
-91,12
+91,7
@@
MODULE_PARM_DESC(io, "io port");
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
-
+static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
@@
-301,6
+296,7
@@
static struct notifier_block sc1200wdt_notifier =
static struct file_operations sc1200wdt_fops =
{
.owner = THIS_MODULE,
static struct file_operations sc1200wdt_fops =
{
.owner = THIS_MODULE,
+ .llseek = no_llseek,
.write = sc1200wdt_write,
.ioctl = sc1200wdt_ioctl,
.open = sc1200wdt_open,
.write = sc1200wdt_write,
.ioctl = sc1200wdt_ioctl,
.open = sc1200wdt_open,
@@
-334,7
+330,7
@@
static int __init sc1200wdt_probe(void)
#if defined CONFIG_PNP
#if defined CONFIG_PNP
-struct pnp_device_id scl200wdt_pnp_devices[] = {
+st
atic st
ruct pnp_device_id scl200wdt_pnp_devices[] = {
/* National Semiconductor PC87307/PC97307 watchdog component */
{.id = "NSC0800", .driver_data = 0},
{.id = ""},
/* National Semiconductor PC87307/PC97307 watchdog component */
{.id = "NSC0800", .driver_data = 0},
{.id = ""},
@@
-381,7
+377,7
@@
static int __init sc1200wdt_init(void)
{
int ret;
{
int ret;
- printk(banner);
+ printk(
"%s\n",
banner);
spin_lock_init(&sc1200wdt_lock);
sema_init(&open_sem, 1);
spin_lock_init(&sc1200wdt_lock);
sema_init(&open_sem, 1);