| Message ID | 20241010-input_automate_of_node_put-v1-3-ebc62138fbf8@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 0ec6f58b63ae17774b10aa41ee86b6a387b60038 |
| Headers | show |
| Series | input: automate of_node_put() calls for device_node | expand |
On Thu, 10 Oct 2024 23:25:53 +0200 Javier Carrasco <javier.carrasco.cruz@gmail.com> wrote: Hi, > Use the scoped variant of the macro to simplify the code and error > handling. This makes the error handling more robust by ensuring that > the child node is always freed. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> Looks good to me: Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > drivers/input/keyboard/sun4i-lradc-keys.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c > index f304cab0ebdb..f1e269605f05 100644 > --- a/drivers/input/keyboard/sun4i-lradc-keys.c > +++ b/drivers/input/keyboard/sun4i-lradc-keys.c > @@ -202,7 +202,7 @@ static void sun4i_lradc_close(struct input_dev *dev) > static int sun4i_lradc_load_dt_keymap(struct device *dev, > struct sun4i_lradc_data *lradc) > { > - struct device_node *np, *pp; > + struct device_node *np; > int i; > int error; > > @@ -223,28 +223,25 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, > return -ENOMEM; > > i = 0; > - for_each_child_of_node(np, pp) { > + for_each_child_of_node_scoped(np, pp) { > struct sun4i_lradc_keymap *map = &lradc->chan0_map[i]; > u32 channel; > > error = of_property_read_u32(pp, "channel", &channel); > if (error || channel != 0) { > dev_err(dev, "%pOFn: Inval channel prop\n", pp); > - of_node_put(pp); > return -EINVAL; > } > > error = of_property_read_u32(pp, "voltage", &map->voltage); > if (error) { > dev_err(dev, "%pOFn: Inval voltage prop\n", pp); > - of_node_put(pp); > return -EINVAL; > } > > error = of_property_read_u32(pp, "linux,code", &map->keycode); > if (error) { > dev_err(dev, "%pOFn: Inval linux,code prop\n", pp); > - of_node_put(pp); > return -EINVAL; > } > >
On Thu, Oct 10, 2024 at 11:25:53PM +0200, Javier Carrasco wrote: > Use the scoped variant of the macro to simplify the code and error > handling. This makes the error handling more robust by ensuring that > the child node is always freed. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> > --- > drivers/input/keyboard/sun4i-lradc-keys.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c > index f304cab0ebdb..f1e269605f05 100644 > --- a/drivers/input/keyboard/sun4i-lradc-keys.c > +++ b/drivers/input/keyboard/sun4i-lradc-keys.c > @@ -202,7 +202,7 @@ static void sun4i_lradc_close(struct input_dev *dev) > static int sun4i_lradc_load_dt_keymap(struct device *dev, > struct sun4i_lradc_data *lradc) > { > - struct device_node *np, *pp; > + struct device_node *np; > int i; > int error; > > @@ -223,28 +223,25 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, > return -ENOMEM; > > i = 0; > - for_each_child_of_node(np, pp) { > + for_each_child_of_node_scoped(np, pp) { > struct sun4i_lradc_keymap *map = &lradc->chan0_map[i]; > u32 channel; > > error = of_property_read_u32(pp, "channel", &channel); > if (error || channel != 0) { > dev_err(dev, "%pOFn: Inval channel prop\n", pp); > - of_node_put(pp); > return -EINVAL; > } > > error = of_property_read_u32(pp, "voltage", &map->voltage); > if (error) { > dev_err(dev, "%pOFn: Inval voltage prop\n", pp); > - of_node_put(pp); > return -EINVAL; I wonder if it would not be better to return the real error rather than clobber it with -EINVAL, but I guess this should be a separate patch. Applied, thank you.
diff --git a/drivers/input/keyboard/sun4i-lradc-keys.c b/drivers/input/keyboard/sun4i-lradc-keys.c index f304cab0ebdb..f1e269605f05 100644 --- a/drivers/input/keyboard/sun4i-lradc-keys.c +++ b/drivers/input/keyboard/sun4i-lradc-keys.c @@ -202,7 +202,7 @@ static void sun4i_lradc_close(struct input_dev *dev) static int sun4i_lradc_load_dt_keymap(struct device *dev, struct sun4i_lradc_data *lradc) { - struct device_node *np, *pp; + struct device_node *np; int i; int error; @@ -223,28 +223,25 @@ static int sun4i_lradc_load_dt_keymap(struct device *dev, return -ENOMEM; i = 0; - for_each_child_of_node(np, pp) { + for_each_child_of_node_scoped(np, pp) { struct sun4i_lradc_keymap *map = &lradc->chan0_map[i]; u32 channel; error = of_property_read_u32(pp, "channel", &channel); if (error || channel != 0) { dev_err(dev, "%pOFn: Inval channel prop\n", pp); - of_node_put(pp); return -EINVAL; } error = of_property_read_u32(pp, "voltage", &map->voltage); if (error) { dev_err(dev, "%pOFn: Inval voltage prop\n", pp); - of_node_put(pp); return -EINVAL; } error = of_property_read_u32(pp, "linux,code", &map->keycode); if (error) { dev_err(dev, "%pOFn: Inval linux,code prop\n", pp); - of_node_put(pp); return -EINVAL; }
Use the scoped variant of the macro to simplify the code and error handling. This makes the error handling more robust by ensuring that the child node is always freed. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- drivers/input/keyboard/sun4i-lradc-keys.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)