Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / drivers / fpga / altera-freeze-bridge.c

diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index ffd586c48ecff3ebbcd8964c332d07b60b059cdd..dd58c4aea92ea6c7c33ea70c628d1642c28d4df7 100644 (file)
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -213,7 +213,6 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
        struct fpga_bridge *br;
        struct resource *res;
        u32 status, revision;
-       int ret;
 
        if (!np)
                return -ENODEV;
@@ -245,20 +244,14 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
 
        priv->base_addr = base_addr;
 
-       br = fpga_bridge_create(dev, FREEZE_BRIDGE_NAME,
-                               &altera_freeze_br_br_ops, priv);
+       br = devm_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;
+       return fpga_bridge_register(br);
 }
 
 static int altera_freeze_br_remove(struct platform_device *pdev)