aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/zynq-fpga.c
diff options
context:
space:
mode:
authorAlan Tull <atull@kernel.org>2018-10-15 18:20:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-16 05:13:50 -0400
commit084181fe8cc7472695b907f0018f4cd00934cb12 (patch)
tree812b6c10de92d91bccfdec2da621abacc2745c4d /drivers/fpga/zynq-fpga.c
parent1c87dc897b8c8ace3aa4480fa29ef6439dabb3ab (diff)
fpga: mgr: add devm_fpga_mgr_create
Add devm_fpga_mgr_create() which is the managed version of fpga_mgr_create(). Change current FPGA manager drivers to use devm_fpga_mgr_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/zynq-fpga.c')
-rw-r--r--drivers/fpga/zynq-fpga.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 3110e00121ca..bb82efeebb9d 100644
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -614,8 +614,8 @@ static int zynq_fpga_probe(struct platform_device *pdev)
614 614
615 clk_disable(priv->clk); 615 clk_disable(priv->clk);
616 616
617 mgr = fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager", 617 mgr = devm_fpga_mgr_create(dev, "Xilinx Zynq FPGA Manager",
618 &zynq_fpga_ops, priv); 618 &zynq_fpga_ops, priv);
619 if (!mgr) 619 if (!mgr)
620 return -ENOMEM; 620 return -ENOMEM;
621 621
@@ -624,7 +624,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
624 err = fpga_mgr_register(mgr); 624 err = fpga_mgr_register(mgr);
625 if (err) { 625 if (err) {
626 dev_err(dev, "unable to register FPGA manager\n"); 626 dev_err(dev, "unable to register FPGA manager\n");
627 fpga_mgr_free(mgr);
628 clk_unprepare(priv->clk); 627 clk_unprepare(priv->clk);
629 return err; 628 return err;
630 } 629 }