tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[WATCHDOG] ep93xx: watchdog timer driver for TS-72xx SBCs cleanup

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>

Wim Van Sebroeck f538ed9e 66aaa7a5

+8 -4
unified split
+8 -4
drivers/watchdog/ts72xx_wdt.c
··· 307 307 error = copy_to_user(argp, &winfo, sizeof(winfo)); 308 308 break; 309 309 310 + case WDIOC_GETSTATUS: 311 + case WDIOC_GETBOOTSTATUS: 312 + return put_user(0, p); 313 + 310 314 case WDIOC_KEEPALIVE: 311 315 ts72xx_wdt_kick(wdt); 312 316 break; ··· 481 477 error = misc_deregister(&ts72xx_wdt_miscdev); 482 478 platform_set_drvdata(pdev, NULL); 483 479 484 - iounmap(wdt->control_reg); 485 - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 486 - release_mem_region(res->start, resource_size(res)); 487 - 488 480 iounmap(wdt->feed_reg); 489 481 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 482 + release_mem_region(res->start, resource_size(res)); 483 + 484 + iounmap(wdt->control_reg); 485 + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 490 486 release_mem_region(res->start, resource_size(res)); 491 487 492 488 kfree(wdt);