Merge tag 'for-6.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[platform/kernel/linux-rpi.git] / drivers / watchdog / nv_tco.c

diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index f6902a3..ac4a9c1 100644 (file)
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -446,12 +446,10 @@ static void nv_tco_cleanup(void)
        release_region(tcobase, 0x10);
 }
 
-static int nv_tco_remove(struct platform_device *dev)
+static void nv_tco_remove(struct platform_device *dev)
 {
        if (tcobase)
                nv_tco_cleanup();
-
-       return 0;
 }
 
 static void nv_tco_shutdown(struct platform_device *dev)
@@ -469,7 +467,7 @@ static void nv_tco_shutdown(struct platform_device *dev)
 
 static struct platform_driver nv_tco_driver = {
        .probe          = nv_tco_init,
-       .remove         = nv_tco_remove,
+       .remove_new     = nv_tco_remove,
        .shutdown       = nv_tco_shutdown,
        .driver         = {
                .name   = TCO_MODULE_NAME,