Skip to content

L
linux
Commit da19526c authored by Dave Jones's avatar Dave Jones
Browse files
Options

Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus 

into tetrachloride.(none):/mnt/stuff/kernel/2.5/watchdog
parents 7f939798 e3fe33d0
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 86 deletions
drivers/char/watchdog/acquirewdt.c
View file @ da19526c
......@@ -220,7 +220,7 @@ static struct notifier_block acq_notifier =
static int __init acq_init(void)
{
printk("WDT driver for Acquire single board computer initialising.\n");
printk(KERN_INFO "WDT driver for Acquire single board computer initialising.\n");
spin_lock_init(&acq_lock);
if (misc_register(&acq_miscdev))
......
drivers/char/watchdog/alim7101_wdt.c
View file @ da19526c
......@@ -100,7 +100,7 @@ static void wdt_timer_ping(unsigned long data)
pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp & ~ALI_WDT_ARM));
pci_write_config_byte(alim7101_pmu, ALI_7101_WDT, (tmp | ALI_WDT_ARM));
} else {
printk(OUR_NAME ": Heartbeat lost! Will not ping the watchdog\n");
printk(KERN_INFO OUR_NAME ": Heartbeat lost! Will not ping the watchdog\n");
}
/* Re-set the timer interval */
timer.expires = jiffies + WDT_INTERVAL;
......@@ -136,7 +136,7 @@ static void wdt_startup(void)
add_timer(&timer);
printk(OUR_NAME ": Watchdog timer is now enabled.\n");
printk(KERN_INFO OUR_NAME ": Watchdog timer is now enabled.\n");
}
static void wdt_turnoff(void)
......@@ -144,7 +144,7 @@ static void wdt_turnoff(void)
/* Stop the timer */
del_timer_sync(&timer);
wdt_change(WDT_DISABLE);
printk(OUR_NAME ": Watchdog timer is now disabled...\n");
printk(KERN_INFO OUR_NAME ": Watchdog timer is now disabled...\n");
}
/*
......@@ -203,7 +203,7 @@ static int fop_close(struct inode * inode, struct file * file)
if(wdt_expect_close)
wdt_turnoff();
else
printk(OUR_NAME ": device file closed unexpectedly. Will not stop the WDT!\n");
printk(KERN_INFO OUR_NAME ": device file closed unexpectedly. Will not stop the WDT!\n");
clear_bit(0, &wdt_is_open);
return 0;
......@@ -262,7 +262,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code, void
* reboot with no heartbeat
*/
wdt_change(WDT_ENABLE);
printk(OUR_NAME ": Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second.\n");
printk(KERN_INFO OUR_NAME ": Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second.\n");
}
return NOTIFY_DONE;
}
......
drivers/char/watchdog/machzwd.c
View file @ da19526c
......@@ -453,9 +453,9 @@ static struct file_operations zf_fops = {
};
static struct miscdevice zf_miscdev = {
WATCHDOG_MINOR,
"watchdog",
&zf_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &zf_fops
};
......@@ -464,9 +464,9 @@ static struct miscdevice zf_miscdev = {
* turn the timebomb registers off.
*/
static struct notifier_block zf_notifier = {
zf_notify_sys,
NULL,
0
.notifier_call = zf_notify_sys,
.next = NULL,
.priority = 0
};
static void __init zf_show_action(int act)
......
drivers/char/watchdog/pcwd.c
View file @ da19526c
......@@ -56,6 +56,7 @@
#include <linux/watchdog.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/reboot.h>
#include <asm/uaccess.h>
#include <asm/io.h>
......@@ -197,28 +198,30 @@ void pcwd_showprevstate(void)
if (revision == PCWD_REVISION_A) {
if (card_status & WD_WDRST)
printk("pcwd: Previous reboot was caused by the card.\n");
printk(KERN_INFO "pcwd: Previous reboot was caused by the card.\n");
if (card_status & WD_T110) {
printk("pcwd: Card senses a CPU Overheat. Panicking!\n");
panic("pcwd: CPU Overheat.\n");
printk(KERN_EMERG "pcwd: Card senses a CPU Overheat. Panicking!\n");
printk(KERN_EMERG "pcwd: CPU Overheat.\n");
machine_power_off();
}
if ((!(card_status & WD_WDRST)) &&
(!(card_status & WD_T110)))
printk("pcwd: Cold boot sense.\n");
printk(KERN_INFO "pcwd: Cold boot sense.\n");
} else {
if (card_status & 0x01)
printk("pcwd: Previous reboot was caused by the card.\n");
printk(KERN_INFO "pcwd: Previous reboot was caused by the card.\n");
if (card_status & 0x04) {
printk("pcwd: Card senses a CPU Overheat. Panicking!\n");
panic("pcwd: CPU Overheat.\n");
printk(KERN_EMERG "pcwd: Card senses a CPU Overheat. Panicking!\n");
printk(KERN_EMERG "pcwd: CPU Overheat.\n");
machine_power_off();
}
if ((!(card_status & 0x01)) &&
(!(card_status & 0x04)))
printk("pcwd: Cold boot sense.\n");
printk(KERN_INFO "pcwd: Cold boot sense.\n");
}
}
......@@ -275,8 +278,10 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
{
rv |= WDIOF_OVERHEAT;
if (temp_panic)
panic("pcwd: Temperature overheat trip!\n");
if (temp_panic) {
printk (KERN_INFO "pcwd: Temperature overheat trip!\n");
machine_power_off();
}
}
}
else
......@@ -288,8 +293,10 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
{
rv |= WDIOF_OVERHEAT;
if (temp_panic)
panic("pcwd: Temperature overheat trip!\n");
if (temp_panic) {
printk (KERN_INFO "pcwd: Temperature overheat trip!\n");
machine_power_off();
}
}
}
......@@ -350,7 +357,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
spin_unlock(&io_lock);
if ((cdat & 0x10) == 0)
{
printk("pcwd: Could not disable card.\n");
printk(KERN_INFO "pcwd: Could not disable card.\n");
return -EIO;
}
......@@ -365,7 +372,7 @@ static int pcwd_ioctl(struct inode *inode, struct file *file,
spin_unlock(&io_lock);
if (cdat & 0x10)
{
printk("pcwd: Could not enable card.\n");
printk(KERN_INFO "pcwd: Could not enable card.\n");
return -EIO;
}
return 0;
......@@ -592,7 +599,7 @@ static int __init pcwatchdog_init(void)
revision = PCWD_REVISION_A;
printk("pcwd: v%s Ken Hollis (kenji@bitgate.com)\n", WD_VER);
printk(KERN_INFO "pcwd: v%s Ken Hollis (kenji@bitgate.com)\n", WD_VER);
/* Initial variables */
supports_temp = 0;
......@@ -611,7 +618,7 @@ static int __init pcwatchdog_init(void)
}
if (!found) {
printk("pcwd: No card detected, or port not available.\n");
printk(KERN_INFO "pcwd: No card detected, or port not available.\n");
return(-EIO);
}
#endif
......@@ -624,9 +631,9 @@ static int __init pcwatchdog_init(void)
revision = get_revision();
if (revision == PCWD_REVISION_A)
printk("pcwd: PC Watchdog (REV.A) detected at port 0x%03x\n", current_readport);
printk(KERN_INFO "pcwd: PC Watchdog (REV.A) detected at port 0x%03x\n", current_readport);
else if (revision == PCWD_REVISION_C)
printk("pcwd: PC Watchdog (REV.C) detected at port 0x%03x (Firmware version: %s)\n",
printk(KERN_INFO "pcwd: PC Watchdog (REV.C) detected at port 0x%03x (Firmware version: %s)\n",
current_readport, get_firmware());
else {
/* Should NEVER happen, unless get_revision() fails. */
......@@ -635,7 +642,7 @@ static int __init pcwatchdog_init(void)
}
if (supports_temp)
printk("pcwd: Temperature Option Detected.\n");
printk(KERN_INFO "pcwd: Temperature Option Detected.\n");
debug_off();
......
drivers/char/watchdog/sbc60xxwdt.c
View file @ da19526c
......@@ -267,9 +267,9 @@ static struct file_operations wdt_fops = {
};
static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR,
"watchdog",
&wdt_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &wdt_fops
};
/*
......@@ -291,9 +291,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier=
{
wdt_notify_sys,
0,
0
.notifier_call = wdt_notify_sys,
.next = NULL,
.priority = 0
};
static void __exit sbc60xxwdt_unload(void)
......
drivers/char/watchdog/sc1200wdt.c
View file @ da19526c
......@@ -297,18 +297,18 @@ static struct notifier_block sc1200wdt_notifier =
static struct file_operations sc1200wdt_fops =
{
owner: THIS_MODULE,
write: sc1200wdt_write,
ioctl: sc1200wdt_ioctl,
open: sc1200wdt_open,
release: sc1200wdt_release
.owner = THIS_MODULE,
.write = sc1200wdt_write,
.ioctl = sc1200wdt_ioctl,
.open = sc1200wdt_open,
.release = sc1200wdt_release
};
static struct miscdevice sc1200wdt_miscdev =
{
minor: WATCHDOG_MINOR,
name: "watchdog",
fops: &sc1200wdt_fops,
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &sc1200wdt_fops,
};
......@@ -397,10 +397,12 @@ static int __init sc1200wdt_init(void)
goto out_clean;
}
#if defined CONFIG_PNP
/* now that the user has specified an IO port and we haven't detected
* any devices, disable pnp support */
isapnp = 0;
pnp_unregister_driver(&scl200wdt_pnp_driver);
#endif
if (!request_region(io, io_len, SC1200_MODULE_NAME)) {
printk(KERN_ERR PFX "Unable to register IO port %#x\n", io);
......@@ -484,5 +486,3 @@ module_exit(sc1200wdt_exit);
MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
MODULE_DESCRIPTION("Driver for National Semiconductor PC87307/PC97307 watchdog component");
MODULE_LICENSE("GPL");
EXPORT_NO_SYMBOLS;
drivers/char/watchdog/sc520_wdt.c
View file @ da19526c
......@@ -281,18 +281,18 @@ static int fop_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
}
static struct file_operations wdt_fops = {
owner: THIS_MODULE,
llseek: fop_llseek,
write: fop_write,
open: fop_open,
release: fop_close,
ioctl: fop_ioctl
.owner = THIS_MODULE,
.llseek = fop_llseek,
.write = fop_write,
.open = fop_open,
.release = fop_close,
.ioctl = fop_ioctl
};
static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR,
"watchdog",
&wdt_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &wdt_fops
};
/*
......@@ -314,9 +314,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier=
{
wdt_notify_sys,
0,
0
.notifier_call = wdt_notify_sys,
.next = NULL,
.priority = 0
};
static void __exit sc520_wdt_unload(void)
......
drivers/char/watchdog/w83877f_wdt.c
View file @ da19526c
......@@ -275,9 +275,9 @@ static struct file_operations wdt_fops = {
};
static struct miscdevice wdt_miscdev = {
WATCHDOG_MINOR,
"watchdog",
&wdt_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &wdt_fops
};
/*
......@@ -299,9 +299,9 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
static struct notifier_block wdt_notifier=
{
wdt_notify_sys,
0,
0
.notifier_call = wdt_notify_sys,
.next = NULL,
.priority = 0
};
static void __exit w83877f_wdt_unload(void)
......
drivers/char/watchdog/wafer5823wdt.c
View file @ da19526c
......@@ -198,17 +198,17 @@ static int wafwdt_notify_sys(struct notifier_block *this, unsigned long code, vo
*/
static struct file_operations wafwdt_fops = {
owner:THIS_MODULE,
write:wafwdt_write,
ioctl:wafwdt_ioctl,
open:wafwdt_open,
release:wafwdt_close,
.owner = THIS_MODULE,
.write = wafwdt_write,
.ioctl = wafwdt_ioctl,
.open = wafwdt_open,
.release = wafwdt_close,
};
static struct miscdevice wafwdt_miscdev = {
WATCHDOG_MINOR,
"watchdog",
&wafwdt_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &wafwdt_fops
};
/*
......@@ -217,9 +217,9 @@ static struct miscdevice wafwdt_miscdev = {
*/
static struct notifier_block wafwdt_notifier = {
wafwdt_notify_sys,
NULL,
0
.notifier_call = wafwdt_notify_sys,
.next = NULL,
.priority = 0
};
static int __init wafwdt_init(void)
......
drivers/char/watchdog/wdt.c
View file @ da19526c
......@@ -465,17 +465,17 @@ static struct file_operations wdt_fops = {
static struct miscdevice wdt_miscdev=
{
WATCHDOG_MINOR,
"watchdog",
&wdt_fops
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &wdt_fops
};
#ifdef CONFIG_WDT_501
static struct miscdevice temp_miscdev=
{
TEMP_MINOR,
"temperature",
&wdt_fops
.minor = TEMP_MINOR,
.name = "temperature",
.fops = &wdt_fops
};
#endif
......@@ -486,9 +486,9 @@ static struct miscdevice temp_miscdev=
static struct notifier_block wdt_notifier=
{
wdt_notify_sys,
NULL,
0
.notifier_call = wdt_notify_sys,
.next = NULL,
.priority = 0
};
/**
......
drivers/char/watchdog/wdt977.c
View file @ da19526c
......@@ -258,7 +258,7 @@ static int wdt977_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
static struct watchdog_info ident = {
identity : "Winbond 83977"
.identity = "Winbond 83977"
};
int temp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7