From: Xu Yilun <yilun.xu@intel.com>
To: Russ Weight <russell.h.weight@intel.com>
Cc: mdf@kernel.org, linux-fpga@vger.kernel.org, trix@redhat.com,
lgoncalv@redhat.com, hao.wu@intel.com, matthew.gerlach@intel.com,
richard.gong@intel.com
Subject: Re: [PATCH v1 5/5] fpga: region: Use standard dev_release for class driver
Date: Thu, 10 Jun 2021 00:01:40 +0800 [thread overview]
Message-ID: <20210609160140.GE1994229@yilunxu-OptiPlex-7050> (raw)
In-Reply-To: <20210609004925.238044-6-russell.h.weight@intel.com>
On Tue, Jun 08, 2021 at 05:49:25PM -0700, Russ Weight wrote:
> The FPGA region class driver data structure is being treated as a managed
> resource instead of using standard dev_release call-back to release the
> class data structure. This change populates the class.dev_release function
> and changes the fpga_region_free() function to call put_device().
> It also changes fpga_region_unregister() to call device_del() instead
> of device_unregister().
>
> Signed-off-by: Russ Weight <russell.h.weight@intel.com>
> ---
> drivers/fpga/fpga-region.c | 46 +++++++++++++++++++-------------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c
> index c3134b89c3fe..31836fba559b 100644
> --- a/drivers/fpga/fpga-region.c
> +++ b/drivers/fpga/fpga-region.c
> @@ -181,7 +181,7 @@ ATTRIBUTE_GROUPS(fpga_region);
>
> /**
> * fpga_region_create - alloc and init a struct fpga_region
> - * @dev: device parent
> + * @parent: device parent
> * @mgr: manager that programs this region
> * @get_bridges: optional function to get bridges to a list
> *
> @@ -192,7 +192,7 @@ ATTRIBUTE_GROUPS(fpga_region);
> * Return: struct fpga_region or NULL
> */
> struct fpga_region
> -*fpga_region_create(struct device *dev,
> +*fpga_region_create(struct device *parent,
Same concern, split the renaming changes out.
> struct fpga_manager *mgr,
> int (*get_bridges)(struct fpga_region *))
> {
> @@ -204,8 +204,10 @@ struct fpga_region
> return NULL;
>
> id = ida_simple_get(&fpga_region_ida, 0, 0, GFP_KERNEL);
> - if (id < 0)
> - goto err_free;
> + if (id < 0) {
> + kfree(region);
> + return NULL;
> + }
>
> region->mgr = mgr;
> region->get_bridges = get_bridges;
> @@ -214,22 +216,17 @@ struct fpga_region
>
> device_initialize(®ion->dev);
> region->dev.class = fpga_region_class;
> - region->dev.parent = dev;
> - region->dev.of_node = dev->of_node;
> + region->dev.parent = parent;
> + region->dev.of_node = parent->of_node;
> region->dev.id = id;
>
> ret = dev_set_name(®ion->dev, "region%d", id);
> - if (ret)
> - goto err_remove;
> + if (ret) {
> + put_device(®ion->dev);
> + return NULL;
> + }
>
> return region;
> -
> -err_remove:
> - ida_simple_remove(&fpga_region_ida, id);
> -err_free:
> - kfree(region);
> -
> - return NULL;
> }
> EXPORT_SYMBOL_GPL(fpga_region_create);
>
> @@ -239,8 +236,7 @@ EXPORT_SYMBOL_GPL(fpga_region_create);
> */
> void fpga_region_free(struct fpga_region *region)
> {
> - ida_simple_remove(&fpga_region_ida, region->dev.id);
> - kfree(region);
> + put_device(®ion->dev);
> }
> EXPORT_SYMBOL_GPL(fpga_region_free);
>
> @@ -248,12 +244,12 @@ static void devm_fpga_region_release(struct device *dev, void *res)
> {
> struct fpga_region *region = *(struct fpga_region **)res;
>
> - fpga_region_free(region);
> + put_device(®ion->dev);
Same concern, I prefer to keep it unchanged.
Thanks,
Yilun
> }
>
> /**
> * devm_fpga_region_create - create and initialize a managed FPGA region struct
> - * @dev: device parent
> + * @parent: device parent
> * @mgr: manager that programs this region
> * @get_bridges: optional function to get bridges to a list
> *
> @@ -268,7 +264,7 @@ static void devm_fpga_region_release(struct device *dev, void *res)
> * Return: struct fpga_region or NULL
> */
> struct fpga_region
> -*devm_fpga_region_create(struct device *dev,
> +*devm_fpga_region_create(struct device *parent,
> struct fpga_manager *mgr,
> int (*get_bridges)(struct fpga_region *))
> {
> @@ -278,12 +274,12 @@ struct fpga_region
> if (!ptr)
> return NULL;
>
> - region = fpga_region_create(dev, mgr, get_bridges);
> + region = fpga_region_create(parent, mgr, get_bridges);
> if (!region) {
> devres_free(ptr);
> } else {
> *ptr = region;
> - devres_add(dev, ptr);
> + devres_add(parent, ptr);
> }
>
> return region;
> @@ -310,12 +306,16 @@ EXPORT_SYMBOL_GPL(fpga_region_register);
> */
> void fpga_region_unregister(struct fpga_region *region)
> {
> - device_unregister(®ion->dev);
> + device_del(®ion->dev);
> }
> EXPORT_SYMBOL_GPL(fpga_region_unregister);
>
> static void fpga_region_dev_release(struct device *dev)
> {
> + struct fpga_region *region = to_fpga_region(dev);
> +
> + ida_simple_remove(&fpga_region_ida, region->dev.id);
> + kfree(region);
> }
>
> /**
> --
> 2.25.1
prev parent reply other threads:[~2021-06-09 16:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 0:49 [PATCH v1 0/5] fpga: Populate dev_release functions Russ Weight
2021-06-09 0:49 ` [PATCH v1 1/5] fpga: mgr: Use standard dev_release for class driver Russ Weight
2021-06-09 15:28 ` Xu Yilun
2021-06-09 15:57 ` Russ Weight
2021-06-09 0:49 ` [PATCH v1 2/5] fpga: altera-pr-ip: Remove fpga_mgr_unregister() call Russ Weight
2021-06-09 15:37 ` Xu Yilun
2021-06-09 16:25 ` Russ Weight
2021-06-09 16:45 ` Moritz Fischer
2021-06-09 0:49 ` [PATCH v1 3/5] fpga: stratix10-soc: Add missing fpga_mgr_free() call Russ Weight
2021-06-09 15:50 ` Xu Yilun
2021-06-09 0:49 ` [PATCH v1 4/5] fpga: bridge: Use standard dev_release for class driver Russ Weight
2021-06-09 15:58 ` Xu Yilun
2021-06-09 0:49 ` [PATCH v1 5/5] fpga: region: " Russ Weight
2021-06-09 16:01 ` Xu Yilun [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210609160140.GE1994229@yilunxu-OptiPlex-7050 \
--to=yilun.xu@intel.com \
--cc=hao.wu@intel.com \
--cc=lgoncalv@redhat.com \
--cc=linux-fpga@vger.kernel.org \
--cc=matthew.gerlach@intel.com \
--cc=mdf@kernel.org \
--cc=richard.gong@intel.com \
--cc=russell.h.weight@intel.com \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).