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, 17 insertions, 3 deletions

diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index f6a96b42e2ca..08efd1895b1b 100644
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -116,7 +116,9 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 {
         struct device *kdev = &pdev->dev;
         struct ts73xx_fpga_priv *priv;
+        struct fpga_manager *mgr;
         struct resource *res;
+        int ret;
 
         priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
@@ -131,13 +133,25 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
                 return PTR_ERR(priv->io_base);
         }
 
-        return fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
-                                 &ts73xx_fpga_ops, priv);
+        mgr = fpga_mgr_create(kdev, "TS-73xx FPGA Manager",
+                              &ts73xx_fpga_ops, priv);
+        if (!mgr)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, mgr);
+
+        ret = fpga_mgr_register(mgr);
+        if (ret)
+                fpga_mgr_free(mgr);
+
+        return ret;
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)
 {
-        fpga_mgr_unregister(&pdev->dev);
+        struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+        fpga_mgr_unregister(mgr);
 
         return 0;
 }