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 4/5] fpga: bridge: Use standard dev_release for class driver Date: Wed, 9 Jun 2021 23:58:17 +0800 [thread overview] Message-ID: <20210609155817.GD1994229@yilunxu-OptiPlex-7050> (raw) In-Reply-To: <20210609004925.238044-5-russell.h.weight@intel.com> On Tue, Jun 08, 2021 at 05:49:24PM -0700, Russ Weight wrote: > The FPGA bridge 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_bridge_free() function to call put_device(). It also > changes fpga_bridge_unregister() to call device_del() instead of > device_unregister(). > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > --- > drivers/fpga/fpga-bridge.c | 48 +++++++++++++++++++------------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c > index 05c6d4f2d043..59f40f26035d 100644 > --- a/drivers/fpga/fpga-bridge.c > +++ b/drivers/fpga/fpga-bridge.c > @@ -313,7 +313,7 @@ ATTRIBUTE_GROUPS(fpga_bridge); > > /** > * fpga_bridge_create - create and initialize a struct fpga_bridge > - * @dev: FPGA bridge device from pdev > + * @parent: FPGA bridge device from pdev The same concern, split the rename changes out. > * @name: FPGA bridge name > * @br_ops: pointer to structure of fpga bridge ops > * @priv: FPGA bridge private data > @@ -323,7 +323,7 @@ ATTRIBUTE_GROUPS(fpga_bridge); > * > * Return: struct fpga_bridge or NULL > */ > -struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name, > +struct fpga_bridge *fpga_bridge_create(struct device *parent, const char *name, > const struct fpga_bridge_ops *br_ops, > void *priv) > { > @@ -331,7 +331,7 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name, > int id, ret; > > if (!name || !strlen(name)) { > - dev_err(dev, "Attempt to register with no name!\n"); > + dev_err(parent, "Attempt to register with no name!\n"); > return NULL; > } > > @@ -340,8 +340,10 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name, > return NULL; > > id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL); > - if (id < 0) > - goto error_kfree; > + if (id < 0) { > + kfree(bridge); > + return NULL; > + } > > mutex_init(&bridge->mutex); > INIT_LIST_HEAD(&bridge->node); > @@ -353,22 +355,17 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name, > device_initialize(&bridge->dev); > bridge->dev.groups = br_ops->groups; > bridge->dev.class = fpga_bridge_class; > - bridge->dev.parent = dev; > - bridge->dev.of_node = dev->of_node; > + bridge->dev.parent = parent; > + bridge->dev.of_node = parent->of_node; > bridge->dev.id = id; > > ret = dev_set_name(&bridge->dev, "br%d", id); > - if (ret) > - goto error_device; > + if (ret) { > + put_device(&bridge->dev); > + return NULL; > + } > > return bridge; > - > -error_device: > - ida_simple_remove(&fpga_bridge_ida, id); > -error_kfree: > - kfree(bridge); > - > - return NULL; > } > EXPORT_SYMBOL_GPL(fpga_bridge_create); > > @@ -378,8 +375,7 @@ EXPORT_SYMBOL_GPL(fpga_bridge_create); > */ > void fpga_bridge_free(struct fpga_bridge *bridge) > { > - ida_simple_remove(&fpga_bridge_ida, bridge->dev.id); > - kfree(bridge); > + put_device(&bridge->dev); > } > EXPORT_SYMBOL_GPL(fpga_bridge_free); > > @@ -387,12 +383,12 @@ static void devm_fpga_bridge_release(struct device *dev, void *res) > { > struct fpga_bridge *bridge = *(struct fpga_bridge **)res; > > - fpga_bridge_free(bridge); > + put_device(&bridge->dev); The same concern, I prefer to keep it unchanged. Thanks, Yilun > } > > /** > * devm_fpga_bridge_create - create and init a managed struct fpga_bridge > - * @dev: FPGA bridge device from pdev > + * @parent: FPGA bridge device from pdev > * @name: FPGA bridge name > * @br_ops: pointer to structure of fpga bridge ops > * @priv: FPGA bridge private data > @@ -408,7 +404,7 @@ static void devm_fpga_bridge_release(struct device *dev, void *res) > * Return: struct fpga_bridge or NULL > */ > struct fpga_bridge > -*devm_fpga_bridge_create(struct device *dev, const char *name, > +*devm_fpga_bridge_create(struct device *parent, const char *name, > const struct fpga_bridge_ops *br_ops, void *priv) > { > struct fpga_bridge **ptr, *bridge; > @@ -417,12 +413,12 @@ struct fpga_bridge > if (!ptr) > return NULL; > > - bridge = fpga_bridge_create(dev, name, br_ops, priv); > + bridge = fpga_bridge_create(parent, name, br_ops, priv); > if (!bridge) { > devres_free(ptr); > } else { > *ptr = bridge; > - devres_add(dev, ptr); > + devres_add(parent, ptr); > } > > return bridge; > @@ -469,12 +465,16 @@ void fpga_bridge_unregister(struct fpga_bridge *bridge) > if (bridge->br_ops && bridge->br_ops->fpga_bridge_remove) > bridge->br_ops->fpga_bridge_remove(bridge); > > - device_unregister(&bridge->dev); > + device_del(&bridge->dev); > } > EXPORT_SYMBOL_GPL(fpga_bridge_unregister); > > static void fpga_bridge_dev_release(struct device *dev) > { > + struct fpga_bridge *bridge = to_fpga_bridge(dev); > + > + ida_simple_remove(&fpga_bridge_ida, bridge->dev.id); > + kfree(bridge); > } > > static int __init fpga_bridge_dev_init(void) > -- > 2.25.1
next prev parent reply other threads:[~2021-06-09 16:09 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 [this message] 2021-06-09 0:49 ` [PATCH v1 5/5] fpga: region: " Russ Weight 2021-06-09 16:01 ` Xu Yilun
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=20210609155817.GD1994229@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 \ --subject='Re: [PATCH v1 4/5] fpga: bridge: Use standard dev_release for class driver' \ /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
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).