Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-block.git] / drivers / watchdog / rdc321x_wdt.c

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index f0c94ea51c3e4687acf481e6dc043cda518078b0..6176f4343fc59ba57e76e681e3a9218e12bca289 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -257,7 +257,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int rdc321x_wdt_remove(struct platform_device *pdev)
+static void rdc321x_wdt_remove(struct platform_device *pdev)
 {
        if (rdc321x_wdt_device.queue) {
                rdc321x_wdt_device.queue = 0;
@@ -265,13 +265,11 @@ static int rdc321x_wdt_remove(struct platform_device *pdev)
        }
 
        misc_deregister(&rdc321x_wdt_misc);
-
-       return 0;
 }
 
 static struct platform_driver rdc321x_wdt_driver = {
        .probe = rdc321x_wdt_probe,
-       .remove = rdc321x_wdt_remove,
+       .remove_new = rdc321x_wdt_remove,
        .driver = {
                .name = "rdc321x-wdt",
        },