Commit e0b79e0b authored by Andrew Victor's avatar Andrew Victor Committed by Wim Van Sebroeck

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 74e86ab8
...@@ -202,9 +202,9 @@ static int __init at91wdt_probe(struct platform_device *pdev) ...@@ -202,9 +202,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
{ {
int res; int res;
if (at91wdt_miscdev.dev) if (at91wdt_miscdev.parent)
return -EBUSY; return -EBUSY;
at91wdt_miscdev.dev = &pdev->dev; at91wdt_miscdev.parent = &pdev->dev;
res = misc_register(&at91wdt_miscdev); res = misc_register(&at91wdt_miscdev);
if (res) if (res)
...@@ -220,7 +220,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev) ...@@ -220,7 +220,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
res = misc_deregister(&at91wdt_miscdev); res = misc_deregister(&at91wdt_miscdev);
if (!res) if (!res)
at91wdt_miscdev.dev = NULL; at91wdt_miscdev.parent = NULL;
return res; return res;
} }
......
...@@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev) ...@@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto err_free; goto err_free;
} }
mpcore_wdt_miscdev.dev = &dev->dev; mpcore_wdt_miscdev.parent = &dev->dev;
ret = misc_register(&mpcore_wdt_miscdev); ret = misc_register(&mpcore_wdt_miscdev);
if (ret) { if (ret) {
dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n", dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n",
......
...@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev) ...@@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
omap_wdt_disable(); omap_wdt_disable();
omap_wdt_adjust_timeout(timer_margin); omap_wdt_adjust_timeout(timer_margin);
omap_wdt_miscdev.dev = &pdev->dev; omap_wdt_miscdev.parent = &pdev->dev;
ret = misc_register(&omap_wdt_miscdev); ret = misc_register(&omap_wdt_miscdev);
if (ret) if (ret)
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment