watchdog: txx9wdt: Convert to platform remove callback returning void

[linux-2.6-microblaze.git] / drivers / watchdog / txx9wdt.c

diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index f900c51..8d5f67a 100644 (file)
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -145,12 +145,11 @@ exit:
        return ret;
 }
 
-static int txx9wdt_remove(struct platform_device *dev)
+static void txx9wdt_remove(struct platform_device *dev)
 {
        watchdog_unregister_device(&txx9wdt);
        clk_disable_unprepare(txx9_imclk);
        clk_put(txx9_imclk);
-       return 0;
 }
 
 static void txx9wdt_shutdown(struct platform_device *dev)
@@ -160,7 +159,7 @@ static void txx9wdt_shutdown(struct platform_device *dev)
 
 static struct platform_driver txx9wdt_driver = {
        .probe = txx9wdt_probe,
-       .remove = txx9wdt_remove,
+       .remove_new = txx9wdt_remove,
        .shutdown = txx9wdt_shutdown,
        .driver = {
                .name = "txx9wdt",