spi: meson-spifc: Convert to platform remove callback returning void

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

diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c
index c8ed781..06626f4 100644 (file)
--- a/drivers/spi/spi-meson-spifc.c
+++ b/drivers/spi/spi-meson-spifc.c
@@ -355,7 +355,7 @@ out_err:
        return ret;
 }
 
-static int meson_spifc_remove(struct platform_device *pdev)
+static void meson_spifc_remove(struct platform_device *pdev)
 {
        struct spi_master *master = platform_get_drvdata(pdev);
        struct meson_spifc *spifc = spi_master_get_devdata(master);
@@ -363,8 +363,6 @@ static int meson_spifc_remove(struct platform_device *pdev)
        pm_runtime_get_sync(&pdev->dev);
        clk_disable_unprepare(spifc->clk);
        pm_runtime_disable(&pdev->dev);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -442,7 +440,7 @@ MODULE_DEVICE_TABLE(of, meson_spifc_dt_match);
 
 static struct platform_driver meson_spifc_driver = {
        .probe  = meson_spifc_probe,
-       .remove = meson_spifc_remove,
+       .remove_new = meson_spifc_remove,
        .driver = {
                .name           = "meson-spifc",
                .of_match_table = of_match_ptr(meson_spifc_dt_match),