summaryrefslogtreecommitdiff
path: root/drivers/fpga/of-fpga-region.c
diff options
context:
space:
mode:
authorAlan Tull <atull@kernel.org>2018-10-16 01:20:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-16 12:13:50 +0300
commitfea82b7f6670002ff36bf1bc77d0345b0b2f2d1c (patch)
treeeeed3d9f54d90d5f01ea84e1ebdd2d05b3553667 /drivers/fpga/of-fpga-region.c
parent213befe049c70cfcfcbb4f6010bd5276dbc1f7b9 (diff)
downloadlinux-fea82b7f6670002ff36bf1bc77d0345b0b2f2d1c.tar.xz
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.c6
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)
if (IS_ERR(mgr))
return -EPROBE_DEFER;
- region = fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
+ region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
if (!region) {
ret = -ENOMEM;
goto eprobe_mgr_put;
@@ -418,7 +418,7 @@ static int of_fpga_region_probe(struct platform_device *pdev)
ret = fpga_region_register(region);
if (ret)
- goto eprobe_free;
+ goto eprobe_mgr_put;
of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
dev_set_drvdata(dev, region);
@@ -427,8 +427,6 @@ static int of_fpga_region_probe(struct platform_device *pdev)
return 0;
-eprobe_free:
- fpga_region_free(region);
eprobe_mgr_put:
fpga_mgr_put(mgr);
return ret;