From 0aa4f62f45bac22c22a692a1b40343de4e48c396 Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Fri, 17 Nov 2006 23:36:08 +0100
Subject: [PATCH] --- yaml --- r: 41415 b: refs/heads/master c:
 414a675964e5636b53b37827b646138f166507d3 h: refs/heads/master i:   41413:
 979a77a5f34bca9010f52392d4318f7990afb35b   41411:
 8ad7209913f07e2500b3a7f9b4a9bc77547b38b5   41407:
 6b9b73b9a3c2531b32f6aa56ae3cbe330812694b v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/char/watchdog/rm9k_wdt.c | 56 +++++++++++++-------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 698b26458434..8e5c1667f0b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97846e3ccbcbcc966e23a91b0d190efd1f889c9b
+refs/heads/master: 414a675964e5636b53b37827b646138f166507d3
diff --git a/trunk/drivers/char/watchdog/rm9k_wdt.c b/trunk/drivers/char/watchdog/rm9k_wdt.c
index 1aad9138f714..22aab8703eda 100644
--- a/trunk/drivers/char/watchdog/rm9k_wdt.c
+++ b/trunk/drivers/char/watchdog/rm9k_wdt.c
@@ -111,6 +111,30 @@ static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs)
 
 
 /* Watchdog functions */
+static void wdt_gpi_start(void)
+{
+	u32 reg;
+
+	lock_titan_regs();
+	reg = titan_readl(CPGIG1ER);
+	titan_writel(reg | (0x100 << wd_ctr), CPGIG1ER);
+	iob();
+	unlock_titan_regs();
+}
+
+static void wdt_gpi_stop(void)
+{
+	u32 reg;
+
+	lock_titan_regs();
+	reg = titan_readl(CPCCR) & ~(0xf << (wd_ctr * 4));
+	titan_writel(reg, CPCCR);
+	reg = titan_readl(CPGIG1ER);
+	titan_writel(reg & ~(0x100 << wd_ctr), CPGIG1ER);
+	iob();
+	unlock_titan_regs();
+}
+
 static void wdt_gpi_set_timeout(unsigned int to)
 {
 	u32 reg;
@@ -134,7 +158,6 @@ static void wdt_gpi_set_timeout(unsigned int to)
 static int wdt_gpi_open(struct inode *i, struct file *f)
 {
 	int res;
-	u32 reg;
 
 	if (unlikely(0 > atomic_dec_if_positive(&opencnt)))
 		return -EBUSY;
@@ -152,12 +175,7 @@ static int wdt_gpi_open(struct inode *i, struct file *f)
 		return res;
 
 	wdt_gpi_set_timeout(timeout);
-
-	lock_titan_regs();
-	reg = titan_readl(CPGIG1ER);
-	titan_writel(reg | (0x100 << wd_ctr), CPGIG1ER);
-	iob();
-	unlock_titan_regs();
+	wdt_gpi_start();
 
 	printk(KERN_INFO "%s: watchdog started, timeout = %u seconds\n",
 		wdt_gpi_name, timeout);
@@ -173,15 +191,7 @@ static int wdt_gpi_release(struct inode *i, struct file *f)
 		locked = 1;
 	} else {
 		if (expect_close) {
-			u32 reg;
-
-			lock_titan_regs();
-			reg = titan_readl(CPCCR) & ~(0xf << (wd_ctr * 4));
-			titan_writel(reg, CPCCR);
-			reg = titan_readl(CPGIG1ER);
-			titan_writel(reg & ~(0x100 << wd_ctr), CPGIG1ER);
-			iob();
-			unlock_titan_regs();
+			wdt_gpi_stop();
 			free_irq(wd_irq, &miscdev);
 			printk(KERN_INFO "%s: watchdog stopped\n", wdt_gpi_name);
 		} else {
@@ -293,17 +303,9 @@ wdt_gpi_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 static int
 wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
 {
-	if(code == SYS_DOWN || code == SYS_HALT) {
-		u32 reg;
-
-		lock_titan_regs();
-		reg = titan_readl(CPCCR) & ~(0xf << (wd_ctr * 4));
-		titan_writel(reg, CPCCR);
-		reg = titan_readl(CPGIG1ER);
-		titan_writel(reg & ~(0x100 << wd_ctr), CPGIG1ER);
-		iob();
-		unlock_titan_regs();
-	}
+	if (code == SYS_DOWN || code == SYS_HALT)
+		wdt_gpi_stop();
+
 	return NOTIFY_DONE;
 }