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/altera-cvp.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/altera-cvp.c')
-rw-r--r-- | drivers/fpga/altera-cvp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c index 7fa793672a7a..610a1558e0ed 100644 --- a/drivers/fpga/altera-cvp.c +++ b/drivers/fpga/altera-cvp.c | |||
@@ -453,8 +453,8 @@ static int altera_cvp_probe(struct pci_dev *pdev, | |||
453 | snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s", | 453 | snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s", |
454 | ALTERA_CVP_MGR_NAME, pci_name(pdev)); | 454 | ALTERA_CVP_MGR_NAME, pci_name(pdev)); |
455 | 455 | ||
456 | mgr = fpga_mgr_create(&pdev->dev, conf->mgr_name, | 456 | mgr = devm_fpga_mgr_create(&pdev->dev, conf->mgr_name, |
457 | &altera_cvp_ops, conf); | 457 | &altera_cvp_ops, conf); |
458 | if (!mgr) { | 458 | if (!mgr) { |
459 | ret = -ENOMEM; | 459 | ret = -ENOMEM; |
460 | goto err_unmap; | 460 | goto err_unmap; |
@@ -463,10 +463,8 @@ static int altera_cvp_probe(struct pci_dev *pdev, | |||
463 | pci_set_drvdata(pdev, mgr); | 463 | pci_set_drvdata(pdev, mgr); |
464 | 464 | ||
465 | ret = fpga_mgr_register(mgr); | 465 | ret = fpga_mgr_register(mgr); |
466 | if (ret) { | 466 | if (ret) |
467 | fpga_mgr_free(mgr); | ||
468 | goto err_unmap; | 467 | goto err_unmap; |
469 | } | ||
470 | 468 | ||
471 | ret = driver_create_file(&altera_cvp_driver.driver, | 469 | ret = driver_create_file(&altera_cvp_driver.driver, |
472 | &driver_attr_chkcfg); | 470 | &driver_attr_chkcfg); |