diff options
author | Alan Tull <atull@kernel.org> | 2018-10-15 18:20:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-16 05:13:50 -0400 |
commit | 084181fe8cc7472695b907f0018f4cd00934cb12 (patch) | |
tree | 812b6c10de92d91bccfdec2da621abacc2745c4d /drivers/fpga/dfl-fme-mgr.c | |
parent | 1c87dc897b8c8ace3aa4480fa29ef6439dabb3ab (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/dfl-fme-mgr.c')
-rw-r--r-- | drivers/fpga/dfl-fme-mgr.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl-fme-mgr.c index 9f045d058cfd..76f37709dd1a 100644 --- a/drivers/fpga/dfl-fme-mgr.c +++ b/drivers/fpga/dfl-fme-mgr.c | |||
@@ -287,7 +287,6 @@ static int fme_mgr_probe(struct platform_device *pdev) | |||
287 | struct fme_mgr_priv *priv; | 287 | struct fme_mgr_priv *priv; |
288 | struct fpga_manager *mgr; | 288 | struct fpga_manager *mgr; |
289 | struct resource *res; | 289 | struct resource *res; |
290 | int ret; | ||
291 | 290 | ||
292 | priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); | 291 | priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); |
293 | if (!priv) | 292 | if (!priv) |
@@ -309,19 +308,15 @@ static int fme_mgr_probe(struct platform_device *pdev) | |||
309 | 308 | ||
310 | fme_mgr_get_compat_id(priv->ioaddr, compat_id); | 309 | fme_mgr_get_compat_id(priv->ioaddr, compat_id); |
311 | 310 | ||
312 | mgr = fpga_mgr_create(dev, "DFL FME FPGA Manager", | 311 | mgr = devm_fpga_mgr_create(dev, "DFL FME FPGA Manager", |
313 | &fme_mgr_ops, priv); | 312 | &fme_mgr_ops, priv); |
314 | if (!mgr) | 313 | if (!mgr) |
315 | return -ENOMEM; | 314 | return -ENOMEM; |
316 | 315 | ||
317 | mgr->compat_id = compat_id; | 316 | mgr->compat_id = compat_id; |
318 | platform_set_drvdata(pdev, mgr); | 317 | platform_set_drvdata(pdev, mgr); |
319 | 318 | ||
320 | ret = fpga_mgr_register(mgr); | 319 | return fpga_mgr_register(mgr); |
321 | if (ret) | ||
322 | fpga_mgr_free(mgr); | ||
323 | |||
324 | return ret; | ||
325 | } | 320 | } |
326 | 321 | ||
327 | static int fme_mgr_remove(struct platform_device *pdev) | 322 | static int fme_mgr_remove(struct platform_device *pdev) |