[WATCHDOG] watchdog miscdevice patch

It looks like the recent changes to 'struct miscdevice' have impacted
some of the Watchdog drivers.

at91rm9200_wdt.c:205: error: 'struct miscdevice' has no member named 'dev'

For the AT91RM9200 driver I just replaced "miscdevice.dev" with
"miscdevice.parent".

The mpcore_wdt.c and omap_wdt.c seem similarly affected.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index 4e7a1145e78..c8da2b0a1cd 100644
--- a/drivers/char/watchdog/at91rm9200_wdt.c
+++ b/drivers/char/watchdog/at91rm9200_wdt.c
@@ -202,9 +202,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 {
         int res;
 
-        if (at91wdt_miscdev.dev)
+        if (at91wdt_miscdev.parent)
                 return -EBUSY;
-        at91wdt_miscdev.dev = &pdev->dev;
+        at91wdt_miscdev.parent = &pdev->dev;
 
         res = misc_register(&at91wdt_miscdev);
         if (res)
@@ -220,7 +220,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
 
         res = misc_deregister(&at91wdt_miscdev);
         if (!res)
-                at91wdt_miscdev.dev = NULL;
+                at91wdt_miscdev.parent = NULL;
 
         return res;
 }
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 3404a9c67f0..e88947f8fe5 100644
--- a/drivers/char/watchdog/mpcore_wdt.c
+++ b/drivers/char/watchdog/mpcore_wdt.c
@@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
                 goto err_free;
         }
 
-        mpcore_wdt_miscdev.dev = &dev->dev;
+        mpcore_wdt_miscdev.parent = &dev->dev;
         ret = misc_register(&mpcore_wdt_miscdev);
         if (ret) {
                 dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n",
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c
index 5dbd7dc2936..6c6f97332db 100644
--- a/drivers/char/watchdog/omap_wdt.c
+++ b/drivers/char/watchdog/omap_wdt.c
@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
         omap_wdt_disable();
         omap_wdt_adjust_timeout(timer_margin);
 
-        omap_wdt_miscdev.dev = &pdev->dev;
+        omap_wdt_miscdev.parent = &pdev->dev;
         ret = misc_register(&omap_wdt_miscdev);
         if (ret)
                 goto fail;