Skip to content

Commit

Permalink
[WATCHDOG] watchdog miscdevice patch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Victor authored and Wim Van Sebroeck committed Dec 7, 2006
1 parent 74e86ab commit e0b79e0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/char/watchdog/at91rm9200_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/watchdog/mpcore_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/watchdog/omap_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e0b79e0

Please sign in to comment.