spi: ar934x: Convert to platform remove callback returning void

[linux-2.6-microblaze.git] / drivers / spi / spi-ar934x.c

diff --git a/drivers/spi/spi-ar934x.c b/drivers/spi/spi-ar934x.c
index 4a6ecaa..c71c834 100644 (file)
--- a/drivers/spi/spi-ar934x.c
+++ b/drivers/spi/spi-ar934x.c
@@ -220,7 +220,7 @@ err_clk_disable:
        return ret;
 }
 
-static int ar934x_spi_remove(struct platform_device *pdev)
+static void ar934x_spi_remove(struct platform_device *pdev)
 {
        struct spi_controller *ctlr;
        struct ar934x_spi *sp;
@@ -230,8 +230,6 @@ static int ar934x_spi_remove(struct platform_device *pdev)
 
        spi_unregister_controller(ctlr);
        clk_disable_unprepare(sp->clk);
-
-       return 0;
 }
 
 static struct platform_driver ar934x_spi_driver = {
@@ -240,7 +238,7 @@ static struct platform_driver ar934x_spi_driver = {
                .of_match_table = ar934x_spi_match,
        },
        .probe = ar934x_spi_probe,
-       .remove = ar934x_spi_remove,
+       .remove_new = ar934x_spi_remove,
 };
 
 module_platform_driver(ar934x_spi_driver);