| Message ID | 20241020-input_automate_of_node_put-v2-1-ddec58b4b99e@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] Input: sparcspkr - use cleanup facility for device_node | expand |
Hi Javier, On Sun, Oct 20, 2024 at 08:27:13PM +0200, Javier Carrasco wrote: > Use the 'free(device_node)' macro to simplify the code by automatically > freeing the device node, which removes the need for explicit calls to > 'of_node_put()'. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> > --- > Changes in v2: > - rebase onto input/next, drop applied patches. > - sparcspkr: drop goto before node declaration and return -ENOMEM. Can we switch the driver to devm so that issues with cleanup and gotos will have less chances of resurfacing? Thanks.
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index ff7b6291894a..66ddea9a203a 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c @@ -182,25 +182,23 @@ static int bbc_beep_probe(struct platform_device *op) { struct sparcspkr_state *state; struct bbc_beep_info *info; - struct device_node *dp; - int err = -ENOMEM; + int err; state = kzalloc(sizeof(*state), GFP_KERNEL); if (!state) - goto out_err; + return -ENOMEM; state->name = "Sparc BBC Speaker"; state->event = bbc_spkr_event; spin_lock_init(&state->lock); - dp = of_find_node_by_path("/"); err = -ENODEV; + struct device_node *dp __free(device_node) = of_find_node_by_path("/"); if (!dp) goto out_free; info = &state->u.bbc; info->clock_freq = of_getintprop_default(dp, "clock-frequency", 0); - of_node_put(dp); if (!info->clock_freq) goto out_free; @@ -221,7 +219,6 @@ static int bbc_beep_probe(struct platform_device *op) out_free: kfree(state); -out_err: return err; }
Use the 'free(device_node)' macro to simplify the code by automatically freeing the device node, which removes the need for explicit calls to 'of_node_put()'. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- Changes in v2: - rebase onto input/next, drop applied patches. - sparcspkr: drop goto before node declaration and return -ENOMEM. - Link to v1: https://lore.kernel.org/r/20241010-input_automate_of_node_put-v1-0-ebc62138fbf8@gmail.com --- drivers/input/misc/sparcspkr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- base-commit: 00850d7b542aa4a8240cf977d43dc6d2158e48d7 change-id: 20241009-input_automate_of_node_put-1bae9f5c02d9 Best regards,