spi: cadence: Convert to platform remove callback returning void

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

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 6a7f7df..1ad86e5 100644 (file)
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -625,7 +625,7 @@ remove_master:
  *
  * Return:     0 on success and error value on error
  */
-static int cdns_spi_remove(struct platform_device *pdev)
+static void cdns_spi_remove(struct platform_device *pdev)
 {
        struct spi_master *master = platform_get_drvdata(pdev);
        struct cdns_spi *xspi = spi_master_get_devdata(master);
@@ -638,8 +638,6 @@ static int cdns_spi_remove(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
 
        spi_unregister_master(master);
-
-       return 0;
 }
 
 /**
@@ -739,7 +737,7 @@ MODULE_DEVICE_TABLE(of, cdns_spi_of_match);
 /* cdns_spi_driver - This structure defines the SPI subsystem platform driver */
 static struct platform_driver cdns_spi_driver = {
        .probe  = cdns_spi_probe,
-       .remove = cdns_spi_remove,
+       .remove_new = cdns_spi_remove,
        .driver = {
                .name = CDNS_SPI_NAME,
                .of_match_table = cdns_spi_of_match,