aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-12-04 08:56:18 -0500
committerWim Van Sebroeck <wim@iguana.be>2006-12-07 16:46:50 -0500
commite0b79e0bc261ad320f6c218ac6823f7ca859171f (patch)
treeaf0aaf30edbe6d42217baa242c6d7aba8bbb406e /drivers/char/watchdog
parent74e86ab884fb491c208905bdc32a9d95740be583 (diff)
[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>
Diffstat (limited to 'drivers/char/watchdog')
-rw-r--r--drivers/char/watchdog/at91rm9200_wdt.c6
-rw-r--r--drivers/char/watchdog/mpcore_wdt.c2
-rw-r--r--drivers/char/watchdog/omap_wdt.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c
index 4e7a1145e78f..c8da2b0a1cd8 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)
202{ 202{
203 int res; 203 int res;
204 204
205 if (at91wdt_miscdev.dev) 205 if (at91wdt_miscdev.parent)
206 return -EBUSY; 206 return -EBUSY;
207 at91wdt_miscdev.dev = &pdev->dev; 207 at91wdt_miscdev.parent = &pdev->dev;
208 208
209 res = misc_register(&at91wdt_miscdev); 209 res = misc_register(&at91wdt_miscdev);
210 if (res) 210 if (res)
@@ -220,7 +220,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
220 220
221 res = misc_deregister(&at91wdt_miscdev); 221 res = misc_deregister(&at91wdt_miscdev);
222 if (!res) 222 if (!res)
223 at91wdt_miscdev.dev = NULL; 223 at91wdt_miscdev.parent = NULL;
224 224
225 return res; 225 return res;
226} 226}
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c
index 3404a9c67f08..e88947f8fe53 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)
347 goto err_free; 347 goto err_free;
348 } 348 }
349 349
350 mpcore_wdt_miscdev.dev = &dev->dev; 350 mpcore_wdt_miscdev.parent = &dev->dev;
351 ret = misc_register(&mpcore_wdt_miscdev); 351 ret = misc_register(&mpcore_wdt_miscdev);
352 if (ret) { 352 if (ret) {
353 dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n", 353 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 5dbd7dc2936f..6c6f97332dbb 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)
290 omap_wdt_disable(); 290 omap_wdt_disable();
291 omap_wdt_adjust_timeout(timer_margin); 291 omap_wdt_adjust_timeout(timer_margin);
292 292
293 omap_wdt_miscdev.dev = &pdev->dev; 293 omap_wdt_miscdev.parent = &pdev->dev;
294 ret = misc_register(&omap_wdt_miscdev); 294 ret = misc_register(&omap_wdt_miscdev);
295 if (ret) 295 if (ret)
296 goto fail; 296 goto fail;