diff options
author | Alan Tull <atull@kernel.org> | 2018-10-15 18:20:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-16 05:13:50 -0400 |
commit | fea82b7f6670002ff36bf1bc77d0345b0b2f2d1c (patch) | |
tree | eeed3d9f54d90d5f01ea84e1ebdd2d05b3553667 /drivers/fpga/of-fpga-region.c | |
parent | 213befe049c70cfcfcbb4f6010bd5276dbc1f7b9 (diff) |
fpga: add devm_fpga_region_create
Add devm_fpga_region_create() which is the
managed version of fpga_region_create().
Change current region drivers to use
devm_fpga_region_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/of-fpga-region.c')
-rw-r--r-- | drivers/fpga/of-fpga-region.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c index 052a1342ab7e..122286fd255a 100644 --- a/drivers/fpga/of-fpga-region.c +++ b/drivers/fpga/of-fpga-region.c | |||
@@ -410,7 +410,7 @@ static int of_fpga_region_probe(struct platform_device *pdev) | |||
410 | if (IS_ERR(mgr)) | 410 | if (IS_ERR(mgr)) |
411 | return -EPROBE_DEFER; | 411 | return -EPROBE_DEFER; |
412 | 412 | ||
413 | region = fpga_region_create(dev, mgr, of_fpga_region_get_bridges); | 413 | region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges); |
414 | if (!region) { | 414 | if (!region) { |
415 | ret = -ENOMEM; | 415 | ret = -ENOMEM; |
416 | goto eprobe_mgr_put; | 416 | goto eprobe_mgr_put; |
@@ -418,7 +418,7 @@ static int of_fpga_region_probe(struct platform_device *pdev) | |||
418 | 418 | ||
419 | ret = fpga_region_register(region); | 419 | ret = fpga_region_register(region); |
420 | if (ret) | 420 | if (ret) |
421 | goto eprobe_free; | 421 | goto eprobe_mgr_put; |
422 | 422 | ||
423 | of_platform_populate(np, fpga_region_of_match, NULL, ®ion->dev); | 423 | of_platform_populate(np, fpga_region_of_match, NULL, ®ion->dev); |
424 | dev_set_drvdata(dev, region); | 424 | dev_set_drvdata(dev, region); |
@@ -427,8 +427,6 @@ static int of_fpga_region_probe(struct platform_device *pdev) | |||
427 | 427 | ||
428 | return 0; | 428 | return 0; |
429 | 429 | ||
430 | eprobe_free: | ||
431 | fpga_region_free(region); | ||
432 | eprobe_mgr_put: | 430 | eprobe_mgr_put: |
433 | fpga_mgr_put(mgr); | 431 | fpga_mgr_put(mgr); |
434 | return ret; | 432 | return ret; |