s390: update defconfigs

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

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 4a8a2fc..1f46717 100644 (file)
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -576,18 +576,7 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
        if (!mgr)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, mgr);
-
-       return fpga_mgr_register(mgr);
-}
-
-static int socfpga_fpga_remove(struct platform_device *pdev)
-{
-       struct fpga_manager *mgr = platform_get_drvdata(pdev);
-
-       fpga_mgr_unregister(mgr);
-
-       return 0;
+       return devm_fpga_mgr_register(dev, mgr);
 }
 
 #ifdef CONFIG_OF
@@ -601,7 +590,6 @@ MODULE_DEVICE_TABLE(of, socfpga_fpga_of_match);
 
 static struct platform_driver socfpga_fpga_driver = {
        .probe = socfpga_fpga_probe,
-       .remove = socfpga_fpga_remove,
        .driver = {
                .name   = "socfpga_fpga_manager",
                .of_match_table = of_match_ptr(socfpga_fpga_of_match),