1 files changed, 20 insertions, 15 deletions

diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index 6159cfcf78a2..ffd586c48ecf 100644
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FPGA Freeze Bridge Controller
  *
  *  Copyright (C) 2016 Altera Corporation. All rights reserved.
- *
- * 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/>.
  */
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -221,8 +210,10 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
         struct device_node *np = pdev->dev.of_node;
         void __iomem *base_addr;
         struct altera_freeze_br_data *priv;
+        struct fpga_bridge *br;
         struct resource *res;
         u32 status, revision;
+        int ret;
 
         if (!np)
                 return -ENODEV;
@@ -254,13 +245,27 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
 
         priv->base_addr = base_addr;
 
-        return fpga_bridge_register(dev, FREEZE_BRIDGE_NAME,
-                                    &altera_freeze_br_br_ops, priv);
+        br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
+                                &altera_freeze_br_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;
+        }
+
+        return 0;
 }
 
 static int altera_freeze_br_remove(struct platform_device *pdev)
 {
-        fpga_bridge_unregister(&pdev->dev);
+        struct fpga_bridge *br = platform_get_drvdata(pdev);
+
+        fpga_bridge_unregister(br);
 
         return 0;
 }