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

diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c
index d4eeb74388da..5a29ab6e3b28 100644
--- a/drivers/fpga/altera-fpga2sdram.c
+++ b/drivers/fpga/altera-fpga2sdram.c
@@ -106,6 +106,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct alt_fpga2sdram_data *priv;
+        struct fpga_bridge *br;
         u32 enable;
         struct regmap *sysmgr;
         int ret = 0;
@@ -131,10 +132,18 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
         /* Get f2s bridge configuration saved in handoff register */
         regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
 
-        ret = fpga_bridge_register(dev, F2S_BRIDGE_NAME,
-                                   &altera_fpga2sdram_br_ops, priv);
-        if (ret)
+        br = fpga_bridge_create(dev, F2S_BRIDGE_NAME,
+                                &altera_fpga2sdram_br_ops, priv);
+        if (!br)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, br);
+
+        ret = fpga_bridge_register(br);
+        if (ret) {
+                fpga_bridge_free(br);
                 return ret;
+        }
 
         dev_info(dev, "driver initialized with handoff %08x\n", priv->mask);
 
@@ -146,7 +155,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                                  (enable ? "enabling" : "disabling"));
                         ret = _alt_fpga2sdram_enable_set(priv, enable);
                         if (ret) {
-                                fpga_bridge_unregister(&pdev->dev);
+                                fpga_bridge_unregister(br);
                                 return ret;
                         }
                 }
@@ -157,7 +166,9 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 
 static int alt_fpga_bridge_remove(struct platform_device *pdev)
 {
-        fpga_bridge_unregister(&pdev->dev);
+        struct fpga_bridge *br = platform_get_drvdata(pdev);
+
+        fpga_bridge_unregister(br);
 
         return 0;
 }