platform/x86: amd-pmc: Move to later in the suspend process

[linux.git] / drivers / fpga / stratix10-soc.c

diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 047fd7f237069ead8573b5eb4dbbfaac3e9fd895..357cea58ec98ef4d5dc428379675ff69d80b88bb 100644 (file)
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -419,23 +419,16 @@ static int s10_probe(struct platform_device *pdev)
 
        init_completion(&priv->status_return_completion);
 
-       mgr = fpga_mgr_create(dev, "Stratix10 SOC FPGA Manager",
-                             &s10_ops, priv);
-       if (!mgr) {
-               dev_err(dev, "unable to create FPGA manager\n");
-               ret = -ENOMEM;
-               goto probe_err;
-       }
-
-       ret = fpga_mgr_register(mgr);
-       if (ret) {
+       mgr = fpga_mgr_register(dev, "Stratix10 SOC FPGA Manager",
+                               &s10_ops, priv);
+       if (IS_ERR(mgr)) {
                dev_err(dev, "unable to register FPGA manager\n");
-               fpga_mgr_free(mgr);
+               ret = PTR_ERR(mgr);
                goto probe_err;
        }
 
        platform_set_drvdata(pdev, mgr);
-       return ret;
+       return 0;
 
 probe_err:
        stratix10_svc_free_channel(priv->chan);
@@ -448,7 +441,6 @@ static int s10_remove(struct platform_device *pdev)
        struct s10_priv *priv = mgr->priv;
 
        fpga_mgr_unregister(mgr);
-       fpga_mgr_free(mgr);
        stratix10_svc_free_channel(priv->chan);
 
        return 0;