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

Change fpga_bridge_register to not set drvdata.  This is to support
the case where a PCIe device can have more than one bridge.

Add API functions to create/free the fpga bridge struct. Change
fpga_bridge_register/unregister to take FPGA bridge struct as
the only parameter.

  struct fpga_bridge
  *fpga_bridge_create(struct device *dev, const char *name,
                      const struct fpga_bridge_ops *br_ops,
                      void *priv);
  void fpga_bridge_free(struct fpga_bridge *br);
  int fpga_bridge_register(struct fpga_bridge *br);
  void fpga_bridge_unregister(struct fpga_bridge *br);

Update the drivers that call fpga_bridge_register with the new API.

Signed-off-by: Alan Tull <atull@kernel.org>
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, 19 insertions, 5 deletions

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index 406d2f10741f..e4d39f0a7572 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -139,6 +139,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
         struct device *dev = &pdev->dev;
         struct altera_hps2fpga_data *priv;
         const struct of_device_id *of_id;
+        struct fpga_bridge *br;
         u32 enable;
         int ret;
 
@@ -190,11 +191,24 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                 }
         }
 
-        ret = fpga_bridge_register(dev, priv->name, &altera_hps2fpga_br_ops,
-                                   priv);
-err:
+        br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv);
+        if (!br) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        platform_set_drvdata(pdev, br);
+
+        ret = fpga_bridge_register(br);
         if (ret)
-                clk_disable_unprepare(priv->clk);
+                goto err_free;
+
+        return 0;
+
+err_free:
+        fpga_bridge_free(br);
+err:
+        clk_disable_unprepare(priv->clk);
 
         return ret;
 }
@@ -204,7 +218,7 @@ static int alt_fpga_bridge_remove(struct platform_device *pdev)
         struct fpga_bridge *bridge = platform_get_drvdata(pdev);
         struct altera_hps2fpga_data *priv = bridge->priv;
 
-        fpga_bridge_unregister(&pdev->dev);
+        fpga_bridge_unregister(bridge);
 
         clk_disable_unprepare(priv->clk);