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, 16 insertions, 2 deletions

diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera-pr-ip-core.c
index a7b31f9797ce..eea521774cf6 100644
--- a/drivers/fpga/altera-pr-ip-core.c
+++ b/drivers/fpga/altera-pr-ip-core.c
@@ -187,6 +187,8 @@ static const struct fpga_manager_ops alt_pr_ops = {
 int alt_pr_register(struct device *dev, void __iomem *reg_base)
 {
         struct alt_pr_priv *priv;
+        struct fpga_manager *mgr;
+        int ret;
         u32 val;
 
         priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -201,15 +203,27 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
                 (val & ALT_PR_CSR_STATUS_MSK) >> ALT_PR_CSR_STATUS_SFT,
                 (int)(val & ALT_PR_CSR_PR_START));
 
-        return fpga_mgr_register(dev, dev_name(dev), &alt_pr_ops, priv);
+        mgr = fpga_mgr_create(dev, dev_name(dev), &alt_pr_ops, priv);
+        if (!mgr)
+                return -ENOMEM;
+
+        dev_set_drvdata(dev, mgr);
+
+        ret = fpga_mgr_register(mgr);
+        if (ret)
+                fpga_mgr_free(mgr);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);
 
 int alt_pr_unregister(struct device *dev)
 {
+        struct fpga_manager *mgr = dev_get_drvdata(dev);
+
         dev_dbg(dev, "%s\n", __func__);
 
-        fpga_mgr_unregister(dev);
+        fpga_mgr_unregister(mgr);
 
         return 0;
 }