]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
watchdog: JZ4740: Drop module remove function
authorPaul Cercueil <paul@crapouillou.net>
Thu, 10 May 2018 18:47:47 +0000 (20:47 +0200)
committerJames Hogan <jhogan@kernel.org>
Mon, 14 May 2018 22:58:23 +0000 (23:58 +0100)
When the watchdog was configured for nowayout, and after the
userspace watchdog daemon closed the dev node without sending the
magic character, unloading this module stopped the watchdog
hardware, which was clearly a problem.

Besides, unloading the module is not possible when the userspace
watchdog daemon is running, so it's safe to assume that we don't
need to stop the watchdog hardware in the jz4740_wdt_remove()
function.

For this reason, the jz4740_wdt_remove() function can then be
dropped alltogether.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-mips@linux-mips.org
Signed-off-by: James Hogan <jhogan@kernel.org>
drivers/watchdog/jz4740_wdt.c

index b8b015a7d045456752783500f1e9ad02f2858509..ec4d99a830ba61b53c3963afba9fddf749de70af 100644 (file)
@@ -206,16 +206,8 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int jz4740_wdt_remove(struct platform_device *pdev)
-{
-       struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);
-
-       return jz4740_wdt_stop(&drvdata->wdt);
-}
-
 static struct platform_driver jz4740_wdt_driver = {
        .probe = jz4740_wdt_probe,
-       .remove = jz4740_wdt_remove,
        .driver = {
                .name = "jz4740-wdt",
                .of_match_table = of_match_ptr(jz4740_wdt_of_matches),