1 files changed, 20 insertions, 17 deletions

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index 406d2f10741f..a974d3f60321 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FPGA to/from HPS Bridge Driver for Altera SoCFPGA Devices
  *
@@ -6,18 +7,6 @@
  * Includes this patch from the mailing list:
  *   fpga: altera-hps2fpga: fix HPS2FPGA bridge visibility to L3 masters
  *   Signed-off-by: Anatolij Gustschin <agust@denx.de>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -139,6 +128,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 +180,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 +207,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);