OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Andrew Victor 2006-12-04 15:56:18 +02:00 committed by Wim Van Sebroeck
parent 74e86ab884
commit e0b79e0bc2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/watchdog/at91rm9200_wdt.c
View File

@ -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;
}

2
drivers/char/watchdog/mpcore_wdt.c
View File

@ -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",

2
drivers/char/watchdog/omap_wdt.c
View File

@ -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;