fpga: region: Use standard dev_release for class driver
Subsystems (3)
[email protected]
reviewerRFC PATCH v10 3/3 fpga: region: Use standard dev_release for class driver
From: Russ Weight <[email protected]>
The FPGA region class driver data structure is being treated as a managed resource instead of using the standard dev_release call-back function to release the class data structure. This change removes the managed resource code and combines the create() and register() functions into a single register() function.
The parameter 'void *priv' was added to register().
Signed-off-by Russ Weight <[email protected]>
Signed-off-by Tom Rix <[email protected]>
Reviewed-by Xu Yilun <[email protected]>
--- Documentation/driver-api/fpga/fpga-region.rst | 4 - drivers/fpga/dfl-fme-region.c | 7 +- drivers/fpga/dfl.c | 12 +- drivers/fpga/fpga-region.c | 108 +++++------------- drivers/fpga/of-fpga-region.c | 10 +- include/linux/fpga/fpga-region.h | 12 +- 6 files changed, 38 insertions(+), 115 deletions(-)
Documentation/driver-api/fpga/fpga-region.rst +0 -4
@@ -47,7 +47,6 @@ API to add a new FPGA region * struct fpga_region — The FPGA region struct * struct fpga_region_ops — Low level FPGA region driver ops -* devm_fpga_region_create() — Allocate and init a region struct * fpga_region_register() — Register an FPGA region * fpga_region_unregister() — Unregister an FPGA region
@@ -79,9 +78,6 @@ following APIs to handle building or tearing down that list. .. kernel-doc:: include/linux/fpga/fpga-region.h :functions: fpga_region_ops -.. kernel-doc:: drivers/fpga/fpga-region.c - :functions: devm_fpga_region_create - .. kernel-doc:: drivers/fpga/fpga-region.c :functions: fpga_region_register
drivers/fpga/dfl-fme-region.c +1 -6
@@ -57,19 +57,14 @@ static int fme_region_probe(struct platform_device *pdev)if (IS_ERR (mgr))return -EPROBE_DEFER ; - region =devm_fpga_region_create (dev, mgr, &fme_fpga_region_ops); + region =fpga_region_register (dev, mgr, &fme_fpga_region_ops, pdata);if (!region) { ret = -ENOMEM ; goto eprobe_mgr_put; } - region->priv = pdata;platform_set_drvdata (pdev, region); - ret =fpga_region_register (region); -if (ret) - goto eprobe_mgr_put; -dev_dbg (dev,"DFL FME FPGA Region probed\n" );return 0 ;
drivers/fpga/dfl.c +4 -8
@@ -1400,19 +1400,15 @@ dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info)if (!cdev)return ERR_PTR (-ENOMEM ); - cdev->region =devm_fpga_region_create (info->dev,NULL ,NULL ); -if (!cdev->region) { - ret = -ENOMEM ; - goto free_cdev_exit; - } - cdev->parent = info->dev;mutex_init (&cdev->lock);INIT_LIST_HEAD (&cdev->port_dev_list); - ret =fpga_region_register (cdev->region); -if (ret) + cdev->region =fpga_region_register (info->dev,NULL ,NULL ,NULL ); +if (IS_ERR (cdev->region)) { + ret =PTR_ERR (cdev->region); goto free_cdev_exit; + }/* create and init build info for enumeration */ binfo =devm_kzalloc (info->dev,sizeof (*binfo),GFP_KERNEL );
drivers/fpga/fpga-region.c +27 -81
154 lines not on this page · raw message
drivers/fpga/of-fpga-region.c +3 -7
@@ -409,16 +409,12 @@ static int of_fpga_region_probe(struct platform_device *pdev)if (IS_ERR (mgr))return -EPROBE_DEFER ; - region =devm_fpga_region_create (dev, mgr, &of_fpga_region_ops); -if (!region) { - ret = -ENOMEM ; + region =fpga_region_register (dev, mgr, &of_fpga_region_ops,NULL ); +if (IS_ERR (region)) { + ret =PTR_ERR (region); goto eprobe_mgr_put; } - ret =fpga_region_register (region); -if (ret) - goto eprobe_mgr_put; -of_platform_populate (np, fpga_region_of_match,NULL , ®ion->dev);platform_set_drvdata (pdev, region);
include/linux/fpga/fpga-region.h +3 -9
@@ -51,15 +51,9 @@ struct fpga_region *fpga_region_class_find(int fpga_region_program_fpga (struct fpga_region *region); -struct fpga_region -*fpga_region_create (struct device *dev,struct fpga_manager *mgr, -const struct fpga_region_ops *rops); -void fpga_region_free (struct fpga_region *region); -int fpga_region_register (struct fpga_region *region); +struct fpga_region * +fpga_region_register (struct device *parent,struct fpga_manager *mgr, +const struct fpga_region_ops *rops,void *priv);void fpga_region_unregister (struct fpga_region *region); -struct fpga_region -*devm_fpga_region_create (struct device *dev,struct fpga_manager *mgr, -const struct fpga_region_ops *rops); -#endif /* _FPGA_REGION_H */
Signature · 1 line
2.26.3