return spi_controller_resume(ctrl);
 }
 
-static int at91_usart_spi_remove(struct platform_device *pdev)
+static void at91_usart_spi_remove(struct platform_device *pdev)
 {
        struct spi_controller *ctlr = platform_get_drvdata(pdev);
        struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr);
 
        at91_usart_spi_release_dma(ctlr);
        clk_disable_unprepare(aus->clk);
-
-       return 0;
 }
 
 static const struct dev_pm_ops at91_usart_spi_pm_ops = {
                .pm = &at91_usart_spi_pm_ops,
        },
        .probe = at91_usart_spi_probe,
-       .remove = at91_usart_spi_remove,
+       .remove_new = at91_usart_spi_remove,
 };
 
 module_platform_driver(at91_usart_spi_driver);