[RFC 6/6] WIP watchdog: pnx4008: refactor disabling device

[Wolfram Sang <w.sang@pengutronix.de>]

wdt_disable and clk_disable must always be used in combination in stop()
to match the initialization in start(), so group them together. Also,
fix disabling clock in remove, which should have been done before.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
 drivers/watchdog/pnx4008_wdt.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 1ccb49a..9f049d7 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -111,19 +111,11 @@ static int pnx4008_wdt_ping(struct watchdog_device *wdd)
 	return 0;
 }
 
-static void wdt_disable(void)
-{
-	spin_lock(&io_lock);
-
-	writel(0, WDTIM_CTRL(wdt_base));	/*stop counter */
-
-	spin_unlock(&io_lock);
-}
-
 static int pnx4008_wdt_start(struct watchdog_device *wdd)
 {
 	int ret;
 
+	//FIXME: better in an open-callback?
 	ret = clk_enable(wdt_clk);
 	if (ret)
 		return ret;
@@ -135,7 +127,11 @@ static int pnx4008_wdt_start(struct watchdog_device *wdd)
 
 static int pnx4008_wdt_stop(struct watchdog_device *wdd)
 {
-	wdt_disable();
+	spin_lock(&io_lock);
+	writel(0, WDTIM_CTRL(wdt_base));
+	spin_unlock(&io_lock);
+
+	//FIXME: better in a close-callback?
 	clk_disable(wdt_clk);
 
 	return 0;
@@ -216,8 +212,8 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)
 		goto disable_clk;
 	}
 
-	wdt_disable();		/*disable for now */
-	clk_disable(wdt_clk);
+	/* disable watchdog and its clock until opened */
+	pnx4008_wdt_stop(&pnx4008_wdd);
 
 	dev_info(&pdev->dev, "PNX4008 Watchdog Timer: heartbeat %d sec\n",
 			heartbeat);
@@ -235,8 +231,7 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)
 static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
 {
 	watchdog_unregister_device(&pnx4008_wdd);
-
-	clk_disable(wdt_clk);
+	/* clk has been disabled on close. If not, we'll reboot anyhow */
 	clk_put(wdt_clk);
 
 	return 0;
-- 
1.7.2.5