aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/of-fpga-region.c
diff options
context:
space:
mode:
authorAlan Tull <atull@kernel.org>2018-05-16 19:49:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-25 12:23:56 -0400
commit9f368977b4589e2fe0b9d3a4cbaf11ff6a58ecf5 (patch)
tree7b2e8d00ea068aa78dc308bb9d7c8cd4d55017bf /drivers/fpga/of-fpga-region.c
parent371cd1b1fdabb33603340559049e46dfeae45b1e (diff)
fpga: region: change api, add fpga_region_create/free
Add fpga_region_create/free API functions. Change fpga_region_register to take FPGA region struct as the only parameter. Change fpga_region_unregister to return void. struct fpga_region *fpga_region_create(struct device *dev, struct fpga_manager *mgr, int (*get_bridges)(struct fpga_region *)); void fpga_region_free(struct fpga_region *region); int fpga_region_register(struct fpga_region *region); void fpga_region_unregister(struct fpga_region *region); Remove groups storage from struct fpga_region, it's not needed. Callers can just "region->dev.groups = groups;" after calling fpga_region_create. Update the drivers that call fpga_region_register with the new API. Signed-off-by: Alan Tull <atull@kernel.org> Signed-off-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.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 35e7e8c4a0cb..9d681a1c5738 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -422,20 +422,15 @@ static int of_fpga_region_probe(struct platform_device *pdev)
422 if (IS_ERR(mgr)) 422 if (IS_ERR(mgr))
423 return -EPROBE_DEFER; 423 return -EPROBE_DEFER;
424 424
425 region = devm_kzalloc(dev, sizeof(*region), GFP_KERNEL); 425 region = fpga_region_create(dev, mgr, of_fpga_region_get_bridges);
426 if (!region) { 426 if (!region) {
427 ret = -ENOMEM; 427 ret = -ENOMEM;
428 goto eprobe_mgr_put; 428 goto eprobe_mgr_put;
429 } 429 }
430 430
431 region->mgr = mgr; 431 ret = fpga_region_register(region);
432
433 /* Specify how to get bridges for this type of region. */
434 region->get_bridges = of_fpga_region_get_bridges;
435
436 ret = fpga_region_register(dev, region);
437 if (ret) 432 if (ret)
438 goto eprobe_mgr_put; 433 goto eprobe_free;
439 434
440 of_platform_populate(np, fpga_region_of_match, NULL, &region->dev); 435 of_platform_populate(np, fpga_region_of_match, NULL, &region->dev);
441 dev_set_drvdata(dev, region); 436 dev_set_drvdata(dev, region);
@@ -444,6 +439,8 @@ static int of_fpga_region_probe(struct platform_device *pdev)
444 439
445 return 0; 440 return 0;
446 441
442eprobe_free:
443 fpga_region_free(region);
447eprobe_mgr_put: 444eprobe_mgr_put:
448 fpga_mgr_put(mgr); 445 fpga_mgr_put(mgr);
449 return ret; 446 return ret;