aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/driver-api/fpga/fpga-mgr.rst
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 /Documentation/driver-api/fpga/fpga-mgr.rst
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 'Documentation/driver-api/fpga/fpga-mgr.rst')
-rw-r--r--Documentation/driver-api/fpga/fpga-mgr.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/driver-api/fpga/fpga-mgr.rst b/Documentation/driver-api/fpga/fpga-mgr.rst
index 82b6dbbd31cd..db8885efbc22 100644
--- a/Documentation/driver-api/fpga/fpga-mgr.rst
+++ b/Documentation/driver-api/fpga/fpga-mgr.rst
@@ -49,18 +49,14 @@ probe function calls fpga_mgr_register(), such as::
49 * them in priv 49 * them in priv
50 */ 50 */
51 51
52 mgr = fpga_mgr_create(dev, "Altera SOCFPGA FPGA Manager", 52 mgr = devm_fpga_mgr_create(dev, "Altera SOCFPGA FPGA Manager",
53 &socfpga_fpga_ops, priv); 53 &socfpga_fpga_ops, priv);
54 if (!mgr) 54 if (!mgr)
55 return -ENOMEM; 55 return -ENOMEM;
56 56
57 platform_set_drvdata(pdev, mgr); 57 platform_set_drvdata(pdev, mgr);
58 58
59 ret = fpga_mgr_register(mgr); 59 return fpga_mgr_register(mgr);
60 if (ret)
61 fpga_mgr_free(mgr);
62
63 return ret;
64 } 60 }
65 61
66 static int socfpga_fpga_remove(struct platform_device *pdev) 62 static int socfpga_fpga_remove(struct platform_device *pdev)
@@ -170,6 +166,9 @@ API for implementing a new FPGA Manager driver
170 :functions: fpga_manager_ops 166 :functions: fpga_manager_ops
171 167
172.. kernel-doc:: drivers/fpga/fpga-mgr.c 168.. kernel-doc:: drivers/fpga/fpga-mgr.c
169 :functions: devm_fpga_mgr_create
170
171.. kernel-doc:: drivers/fpga/fpga-mgr.c
173 :functions: fpga_mgr_create 172 :functions: fpga_mgr_create
174 173
175.. kernel-doc:: drivers/fpga/fpga-mgr.c 174.. kernel-doc:: drivers/fpga/fpga-mgr.c