Merge tag 'tif-task_work.arch-2020-12-14' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index 824abbb..27defa9 100644 (file)
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -259,18 +259,7 @@ static int xilinx_spi_probe(struct spi_device *spi)
        if (!mgr)
                return -ENOMEM;
 
-       spi_set_drvdata(spi, mgr);
-
-       return fpga_mgr_register(mgr);
-}
-
-static int xilinx_spi_remove(struct spi_device *spi)
-{
-       struct fpga_manager *mgr = spi_get_drvdata(spi);
-
-       fpga_mgr_unregister(mgr);
-
-       return 0;
+       return devm_fpga_mgr_register(&spi->dev, mgr);
 }
 
 static const struct of_device_id xlnx_spi_of_match[] = {
@@ -285,7 +274,6 @@ static struct spi_driver xilinx_slave_spi_driver = {
                .of_match_table = of_match_ptr(xlnx_spi_of_match),
        },
        .probe = xilinx_spi_probe,
-       .remove = xilinx_spi_remove,
 };
 
 module_spi_driver(xilinx_slave_spi_driver)