| Message ID | 20241021-typec-class-fwnode_handle_put-v2-2-3281225d3d27@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1ab0b9ae587373f9f800b6fda01b8faf02b3530b |
| Headers | show |
| Series | usb: typec: fix unreleased fwnode_handle in typec_port_register_altmodes() | expand |
On Mon, Oct 21, 2024 at 10:45:30PM +0200, Javier Carrasco wrote: > Use the __free() macro for 'altmodes_node' to automatically release the > node when it goes out of scope, removing the need for explicit calls to > fwnode_handle_put(). > > Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/class.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c > index 1eb240604cf6..58f40156de56 100644 > --- a/drivers/usb/typec/class.c > +++ b/drivers/usb/typec/class.c > @@ -2293,7 +2293,7 @@ void typec_port_register_altmodes(struct typec_port *port, > const struct typec_altmode_ops *ops, void *drvdata, > struct typec_altmode **altmodes, size_t n) > { > - struct fwnode_handle *altmodes_node, *child; > + struct fwnode_handle *child; > struct typec_altmode_desc desc; > struct typec_altmode *alt; > size_t index = 0; > @@ -2301,7 +2301,9 @@ void typec_port_register_altmodes(struct typec_port *port, > u32 vdo; > int ret; > > - altmodes_node = device_get_named_child_node(&port->dev, "altmodes"); > + struct fwnode_handle *altmodes_node __free(fwnode_handle) = > + device_get_named_child_node(&port->dev, "altmodes"); > + > if (!altmodes_node) > return; /* No altmodes specified */ > > @@ -2341,7 +2343,6 @@ void typec_port_register_altmodes(struct typec_port *port, > altmodes[index] = alt; > index++; > } > - fwnode_handle_put(altmodes_node); > } > EXPORT_SYMBOL_GPL(typec_port_register_altmodes); >
diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 1eb240604cf6..58f40156de56 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -2293,7 +2293,7 @@ void typec_port_register_altmodes(struct typec_port *port, const struct typec_altmode_ops *ops, void *drvdata, struct typec_altmode **altmodes, size_t n) { - struct fwnode_handle *altmodes_node, *child; + struct fwnode_handle *child; struct typec_altmode_desc desc; struct typec_altmode *alt; size_t index = 0; @@ -2301,7 +2301,9 @@ void typec_port_register_altmodes(struct typec_port *port, u32 vdo; int ret; - altmodes_node = device_get_named_child_node(&port->dev, "altmodes"); + struct fwnode_handle *altmodes_node __free(fwnode_handle) = + device_get_named_child_node(&port->dev, "altmodes"); + if (!altmodes_node) return; /* No altmodes specified */ @@ -2341,7 +2343,6 @@ void typec_port_register_altmodes(struct typec_port *port, altmodes[index] = alt; index++; } - fwnode_handle_put(altmodes_node); } EXPORT_SYMBOL_GPL(typec_port_register_altmodes);
Use the __free() macro for 'altmodes_node' to automatically release the node when it goes out of scope, removing the need for explicit calls to fwnode_handle_put(). Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- drivers/usb/typec/class.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)