fpga: manager: change api, don't use drvdata

Change fpga_mgr_register to not set or use drvdata.  This supports
the case where a PCIe device has more than one manager.

Add fpga_mgr_create/free functions.  Change fpga_mgr_register and
fpga_mgr_unregister functions to take the mgr struct as their only
parameter.

  struct fpga_manager *fpga_mgr_create(struct device *dev,
                const char *name,
                const struct fpga_manager_ops *mops,
                void *priv);
  void fpga_mgr_free(struct fpga_manager *mgr);
  int fpga_mgr_register(struct fpga_manager *mgr);
  void fpga_mgr_unregister(struct fpga_manager *mgr);

Update the drivers that call fpga_mgr_register with the new API.

Signed-off-by: Alan Tull <atull@kernel.org>
[Moritz: Fixup whitespace issue]
Reported-by: Jiuyue Ma <majiuyue@huawei.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 70b15b303471..3110e00121ca 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -558,6 +558,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct zynq_fpga_priv *priv;
+        struct fpga_manager *mgr;
         struct resource *res;
         int err;
 
@@ -613,10 +614,17 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
         clk_disable(priv->clk);
 
-        err = fpga_mgr_register(dev, "Xilinx Zynq FPGA Manager",
-                                &zynq_fpga_ops, priv);
+        mgr = fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
+                              &zynq_fpga_ops, priv);
+        if (!mgr)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, mgr);
+
+        err = fpga_mgr_register(mgr);
         if (err) {
                 dev_err(dev, "unable to register FPGA manager\n");
+                fpga_mgr_free(mgr);
                 clk_unprepare(priv->clk);
                 return err;
         }
@@ -632,7 +640,7 @@ static int zynq_fpga_remove(struct platform_device *pdev)
         mgr = platform_get_drvdata(pdev);
         priv = mgr->priv;
 
-        fpga_mgr_unregister(&pdev->dev);
+        fpga_mgr_unregister(mgr);
 
         clk_unprepare(priv->clk);