| Message ID | 20210609221135.261837-8-russell.h.weight@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fpga: Populate dev_release functions | expand |
Looks good to me. Reviewed-by: Xu Yilun <yilun.xu@intel.com> On Wed, Jun 09, 2021 at 03:11:34PM -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> > --- > v2: > - Moved the renaming of "dev" to "parent" to a separate patch > - Call fpga_bridge_free() in devm_fpga_bridge_release() instead of > put_device() > --- > drivers/fpga/fpga-bridge.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c > index 6c56afc66a6d..b40f4b4228e7 100644 > --- a/drivers/fpga/fpga-bridge.c > +++ b/drivers/fpga/fpga-bridge.c > @@ -340,8 +340,10 @@ struct fpga_bridge *fpga_bridge_create(struct device *parent, 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); > @@ -358,17 +360,12 @@ struct fpga_bridge *fpga_bridge_create(struct device *parent, const char *name, > 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); > > @@ -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
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c index 6c56afc66a6d..b40f4b4228e7 100644 --- a/drivers/fpga/fpga-bridge.c +++ b/drivers/fpga/fpga-bridge.c @@ -340,8 +340,10 @@ struct fpga_bridge *fpga_bridge_create(struct device *parent, 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); @@ -358,17 +360,12 @@ struct fpga_bridge *fpga_bridge_create(struct device *parent, const char *name, 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); @@ -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)
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> --- v2: - Moved the renaming of "dev" to "parent" to a separate patch - Call fpga_bridge_free() in devm_fpga_bridge_release() instead of put_device() --- drivers/fpga/fpga-bridge.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)