aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/altera-hps2fpga.c
diff options
context:
space:
mode:
authorAlan Tull <atull@kernel.org>2018-10-15 18:20:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-16 05:13:50 -0400
commit213befe049c70cfcfcbb4f6010bd5276dbc1f7b9 (patch)
treeaec320c32e568e2b05b4a9280c45f1e3e6b7daaa /drivers/fpga/altera-hps2fpga.c
parent084181fe8cc7472695b907f0018f4cd00934cb12 (diff)
fpga: bridge: add devm_fpga_bridge_create
Add devm_fpga_bridge_create() which is the managed version of fpga_bridge_create(). Change current bridge drivers to use devm_fpga_bridge_create(). Signed-off-by: Alan Tull <atull@kernel.org> Suggested-by: Federico Vaga <federico.vaga@cern.ch> Acked-by: Moritz Fischer <mdf@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/fpga/altera-hps2fpga.c')
-rw-r--r--drivers/fpga/altera-hps2fpga.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index a974d3f60321..77b95f251821 100644
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -180,7 +180,8 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
180 } 180 }
181 } 181 }
182 182
183 br = fpga_bridge_create(dev, priv->name, &altera_hps2fpga_br_ops, priv); 183 br = devm_fpga_bridge_create(dev, priv->name,
184 &altera_hps2fpga_br_ops, priv);
184 if (!br) { 185 if (!br) {
185 ret = -ENOMEM; 186 ret = -ENOMEM;
186 goto err; 187 goto err;
@@ -190,12 +191,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
190 191
191 ret = fpga_bridge_register(br); 192 ret = fpga_bridge_register(br);
192 if (ret) 193 if (ret)
193 goto err_free; 194 goto err;
194 195
195 return 0; 196 return 0;
196 197
197err_free:
198 fpga_bridge_free(br);
199err: 198err:
200 clk_disable_unprepare(priv->clk); 199 clk_disable_unprepare(priv->clk);
201 200