[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZxSA0YF3f7Q86pRV@google.com>
Date: Sat, 19 Oct 2024 21:02:25 -0700
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Javier Carrasco <javier.carrasco.cruz@...il.com>
Cc: Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Hans de Goede <hdegoede@...hat.com>, Chen-Yu Tsai <wens@...e.org>,
Jernej Skrabec <jernej.skrabec@...il.com>,
Samuel Holland <samuel@...lland.org>,
Florian Fainelli <florian.fainelli@...adcom.com>,
Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, linux-sunxi@...ts.linux.dev,
linux-rpi-kernel@...ts.infradead.org
Subject: Re: [PATCH 03/10] Input: sun4i-lradc-keys - switch to
for_each_child_of_node_scoped
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@...il.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.
--
Dmitry
Powered by blists - more mailing lists