Skip to content

Commit

Permalink
[WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup
Browse files Browse the repository at this point in the history
Clean-up driver:
* make release the reverse of probe so that both are consistent
* add WDIOC_GETSTATUS & WDIOC_GETBOOTSTATUS ioctls.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Wim Van Sebroeck committed Mar 6, 2010
1 parent 66aaa7a commit f538ed9
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/watchdog/ts72xx_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,10 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,
error = copy_to_user(argp, &winfo, sizeof(winfo));
break;

case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
return put_user(0, p);

case WDIOC_KEEPALIVE:
ts72xx_wdt_kick(wdt);
break;
Expand Down Expand Up @@ -477,14 +481,14 @@ static __devexit int ts72xx_wdt_remove(struct platform_device *pdev)
error = misc_deregister(&ts72xx_wdt_miscdev);
platform_set_drvdata(pdev, NULL);

iounmap(wdt->control_reg);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res));

iounmap(wdt->feed_reg);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
release_mem_region(res->start, resource_size(res));

iounmap(wdt->control_reg);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res));

kfree(wdt);
return error;
}
Expand Down

0 comments on commit f538ed9

Please sign in to comment.