Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[safe/jmp/linux-2.6] / drivers / watchdog / pnx4008_wdt.c

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 0ed8416..bf5b97c 100644 (file)
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -30,6 +30,7 @@
 #include <linux/spinlock.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 #include <mach/hardware.h>
 
 #define MODULE_NAME "PNX4008-WDT: "
@@ -54,22 +55,22 @@
 
 /* WDTIM_CTRL bit definitions */
 #define COUNT_ENAB     1
-#define RESET_COUNT    (1<<1)
-#define DEBUG_EN       (1<<2)
+#define RESET_COUNT    (1 << 1)
+#define DEBUG_EN       (1 << 2)
 
 /* WDTIM_MCTRL bit definitions */
 #define MR0_INT        1
 #undef  RESET_COUNT0
-#define RESET_COUNT0   (1<<2)
-#define STOP_COUNT0    (1<<2)
-#define M_RES1         (1<<3)
-#define M_RES2         (1<<4)
-#define RESFRC1        (1<<5)
-#define RESFRC2        (1<<6)
+#define RESET_COUNT0   (1 << 2)
+#define STOP_COUNT0    (1 << 2)
+#define M_RES1         (1 << 3)
+#define M_RES2         (1 << 4)
+#define RESFRC1        (1 << 5)
+#define RESFRC2        (1 << 6)
 
 /* WDTIM_EMR bit definitions */
 #define EXT_MATCH0      1
-#define MATCH_OUTPUT_HIGH (2<<4)       /*a MATCH_CTRL setting */
+#define MATCH_OUTPUT_HIGH (2 << 4)     /*a MATCH_CTRL setting */
 
 /* WDTIM_RES bit definitions */
 #define WDOG_RESET      1      /* read only */
@@ -96,9 +97,6 @@ static void wdt_enable(void)
 {
        spin_lock(&io_lock);
 
-       if (wdt_clk)
-               clk_set_rate(wdt_clk, 1);
-
        /* stop counter, initiate counter reset */
        __raw_writel(RESET_COUNT, WDTIM_CTRL(wdt_base));
        /*wait for reset to complete. 100% guarantee event */
@@ -125,19 +123,25 @@ static void wdt_disable(void)
        spin_lock(&io_lock);
 
        __raw_writel(0, WDTIM_CTRL(wdt_base));  /*stop counter */
-       if (wdt_clk)
-               clk_set_rate(wdt_clk, 0);
 
        spin_unlock(&io_lock);
 }
 
 static int pnx4008_wdt_open(struct inode *inode, struct file *file)
 {
+       int ret;
+
        if (test_and_set_bit(WDT_IN_USE, &wdt_status))
                return -EBUSY;
 
        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
 
+       ret = clk_enable(wdt_clk);
+       if (ret) {
+               clear_bit(WDT_IN_USE, &wdt_status);
+               return ret;
+       }
+
        wdt_enable();
 
        return nonseekable_open(inode, file);
@@ -173,8 +177,8 @@ static const struct watchdog_info ident = {
        .identity = "PNX4008 Watchdog",
 };
 
-static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
-                                       unsigned int cmd, unsigned long arg)
+static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg)
 {
        int ret = -ENOTTY;
        int time;
@@ -225,6 +229,7 @@ static int pnx4008_wdt_release(struct inode *inode, struct file *file)
                printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n");
 
        wdt_disable();
+       clk_disable(wdt_clk);
        clear_bit(WDT_IN_USE, &wdt_status);
        clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
 
@@ -246,7 +251,7 @@ static struct miscdevice pnx4008_wdt_miscdev = {
        .fops = &pnx4008_wdt_fops,
 };
 
-static int pnx4008_wdt_probe(struct platform_device *pdev)
+static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)
 {
        int ret = 0, size;
        struct resource *res;
@@ -264,7 +269,7 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       size = res->end - res->start + 1;
+       size = resource_size(res);
        wdt_mem = request_mem_region(res->start, size, pdev->name);
 
        if (wdt_mem == NULL) {
@@ -273,25 +278,33 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
        }
        wdt_base = (void __iomem *)IO_ADDRESS(res->start);
 
-       wdt_clk = clk_get(&pdev->dev, "wdt_ck");
+       wdt_clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(wdt_clk)) {
                ret = PTR_ERR(wdt_clk);
                release_resource(wdt_mem);
                kfree(wdt_mem);
                goto out;
-       } else
-               clk_set_rate(wdt_clk, 1);
+       }
+
+       ret = clk_enable(wdt_clk);
+       if (ret) {
+               release_resource(wdt_mem);
+               kfree(wdt_mem);
+               goto out;
+       }
 
        ret = misc_register(&pnx4008_wdt_miscdev);
        if (ret < 0) {
                printk(KERN_ERR MODULE_NAME "cannot register misc device\n");
                release_resource(wdt_mem);
                kfree(wdt_mem);
-               clk_set_rate(wdt_clk, 0);
+               clk_disable(wdt_clk);
+               clk_put(wdt_clk);
        } else {
                boot_status = (__raw_readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ?
                    WDIOF_CARDRESET : 0;
                wdt_disable();          /*disable for now */
+               clk_disable(wdt_clk);
                set_bit(WDT_DEVICE_INITED, &wdt_status);
        }
 
@@ -299,14 +312,13 @@ out:
        return ret;
 }
 
-static int pnx4008_wdt_remove(struct platform_device *pdev)
+static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
 {
        misc_deregister(&pnx4008_wdt_miscdev);
-       if (wdt_clk) {
-               clk_set_rate(wdt_clk, 0);
-               clk_put(wdt_clk);
-               wdt_clk = NULL;
-       }
+
+       clk_disable(wdt_clk);
+       clk_put(wdt_clk);
+
        if (wdt_mem) {
                release_resource(wdt_mem);
                kfree(wdt_mem);
@@ -317,11 +329,11 @@ static int pnx4008_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver platform_wdt_driver = {
        .driver = {
-               .name = "watchdog",
+               .name = "pnx4008-watchdog",
                .owner  = THIS_MODULE,
        },
        .probe = pnx4008_wdt_probe,
-       .remove = pnx4008_wdt_remove,
+       .remove = __devexit_p(pnx4008_wdt_remove),
 };
 
 static int __init pnx4008_wdt_init(void)
@@ -352,4 +364,4 @@ MODULE_PARM_DESC(nowayout,
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:pnx4008-watchdog");