The patch titled
watchdog-add-bcm47xx-driver-update
has been removed from the -mm tree. Its filename was
watchdog-add-bcm47xx-driver-update.patch
This patch was dropped because it was folded into watchdog-add-bcm47xx-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: watchdog-add-bcm47xx-driver-update
From: matthieu castet <castet.matthieu@xxxxxxx>
Cc: Aleksandar Radovanovic <biblbroks@xxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
Signed-off-by: Matthieu CASTET <castet.matthieu@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/watchdog/Kconfig | 8 +++----
drivers/watchdog/bcm47xx_wdt.c | 33 ++++++++++++++-----------------
2 files changed, 19 insertions(+), 22 deletions(-)
diff -puN drivers/watchdog/Kconfig~watchdog-add-bcm47xx-driver-update drivers/watchdog/Kconfig
--- a/drivers/watchdog/Kconfig~watchdog-add-bcm47xx-driver-update
+++ a/drivers/watchdog/Kconfig
@@ -800,10 +800,10 @@ config TXX9_WDT
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
config BCM47XX_WDT
- tristate "Broadcom BCM47xx Watchdog Timer"
- depends on BCM47XX
- help
- Hardware driver for the Broadcom BCM47xx Watchog Timer.
+ tristate "Broadcom BCM47xx Watchdog Timer"
+ depends on BCM47XX
+ help
+ Hardware driver for the Broadcom BCM47xx Watchog Timer.
# PARISC Architecture
diff -puN drivers/watchdog/bcm47xx_wdt.c~watchdog-add-bcm47xx-driver-update drivers/watchdog/bcm47xx_wdt.c
--- a/drivers/watchdog/bcm47xx_wdt.c~watchdog-add-bcm47xx-driver-update
+++ a/drivers/watchdog/bcm47xx_wdt.c
@@ -2,6 +2,7 @@
* Watchdog driver for Broadcom BCM47XX
*
* Copyright (C) 2008 Aleksandar Radovanovic <biblbroks@xxxxxxxxxxx>
+ * Copyright (C) 2009 Matthieu CASTET <castet.matthieu@xxxxxxx>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -17,7 +18,7 @@
#include <linux/miscdevice.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/notifier.h>
+#include <linux/reboot.h>
#include <linux/types.h>
#include <linux/uaccess.h>
#include <linux/watchdog.h>
@@ -45,8 +46,6 @@ MODULE_PARM_DESC(nowayout,
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
#endif
-static struct platform_device *bcm47xx_wdt_platform_device;
-
static unsigned long bcm47xx_wdt_busy;
static char expect_release;
static struct timer_list wdt_timer;
@@ -65,12 +64,11 @@ static inline int bcm47xx_wdt_hw_stop(vo
static void bcm47xx_timer_tick(unsigned long unused)
{
- if(!atomic_dec_and_test(&ticks)) {
+ if (!atomic_dec_and_test(&ticks)) {
bcm47xx_wdt_hw_start();
mod_timer(&wdt_timer, jiffies + HZ);
- }
- else {
- printk(KERN_CRIT PFX "Watchdog will fire soon!!!.\n");
+ } else {
+ printk(KERN_CRIT DRV_NAME "Watchdog will fire soon!!!\n");
}
}
@@ -87,7 +85,7 @@ static void bcm47xx_wdt_start(void)
static void bcm47xx_wdt_pause(void)
{
- del_timer(&wdt_timer);
+ del_timer_sync(&wdt_timer);
bcm47xx_wdt_hw_stop();
}
@@ -119,7 +117,8 @@ static int bcm47xx_wdt_release(struct in
if (expect_release == 42) {
bcm47xx_wdt_stop();
} else {
- printk(KERN_CRIT DRV_NAME ": Unexpected close, not stopping watchdog!\n");
+ printk(KERN_CRIT DRV_NAME
+ ": Unexpected close, not stopping watchdog!\n");
bcm47xx_wdt_start();
}
@@ -128,8 +127,8 @@ static int bcm47xx_wdt_release(struct in
return 0;
}
-static ssize_t bcm47xx_wdt_write (struct file *file, const char __user *data,
- size_t len, loff_t * ppos)
+static ssize_t bcm47xx_wdt_write(struct file *file, const char __user *data,
+ size_t len, loff_t *ppos)
{
if (len) {
if (!nowayout) {
@@ -210,8 +209,8 @@ static long bcm47xx_wdt_ioctl(struct fil
}
}
-static int bcm47xx_wdt_notify_sys(struct notifier_block *this, unsigned long code,
- void *unused)
+static int bcm47xx_wdt_notify_sys(struct notifier_block *this,
+ unsigned long code, void *unused)
{
if (code == SYS_DOWN || code == SYS_HALT)
bcm47xx_wdt_stop();
@@ -248,13 +247,14 @@ static int __init bcm47xx_wdt_init(void)
if (bcm47xx_wdt_settimeout(wdt_time)) {
bcm47xx_wdt_settimeout(WDT_DEFAULT_TIME);
- printk(KERN_INFO DRV_NAME ": wdt_time value must be 1 <= wdt_time <= 256, using %d\n",
+ printk(KERN_INFO DRV_NAME
+ ": wdt_time value must be 1 <= wdt_time <= 256, using %d\n",
wdt_time);
}
ret = register_reboot_notifier(&bcm47xx_wdt_notifier);
if (ret)
- ret;
+ return ret;
ret = misc_register(&bcm47xx_wdt_miscdev);
if (ret) {
@@ -275,8 +275,6 @@ static void __exit bcm47xx_wdt_exit(void
misc_deregister(&bcm47xx_wdt_miscdev);
unregister_reboot_notifier(&bcm47xx_wdt_notifier);
-
- return 0;
}
module_init(bcm47xx_wdt_init);
@@ -286,4 +284,3 @@ MODULE_AUTHOR("Aleksandar Radovanovic");
MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx");
MODULE_LICENSE("GPL");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:bcm47xx_wdt");
_
Patches currently in -mm which might be from castet.matthieu@xxxxxxx are
linux-next.patch
watchdog-add-bcm47xx-driver.patch
watchdog-add-bcm47xx-driver-update.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
