From: Andre Przywara <andre.przywara@arm.com>
To: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Cc: Yangtao Li <tiny.windzz@gmail.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] cpufreq: sun50i: replace of_node_put() with automatic cleanup handler
Date: Fri, 10 May 2024 18:42:13 +0100 [thread overview]
Message-ID: <20240510184213.68f92cab@donnerap.manchester.arm.com> (raw)
In-Reply-To: <20240503-sun50i-cpufreq-nvmem-cleanup-v1-2-0a2352cac46b@gmail.com>
On Fri, 03 May 2024 19:52:33 +0200
Javier Carrasco <javier.carrasco.cruz@gmail.com> wrote:
Hi,
> Make use of the __free() cleanup handler to automatically free nodes
> when they get out of scope.
Looks alright, the last function is now particularly neat.
> Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
I haven't tested the error paths yet, but it certainly boots fine on an
OrangePi Zero3.
Cheers,
Andre
> ---
> drivers/cpufreq/sun50i-cpufreq-nvmem.c | 25 ++++++++-----------------
> 1 file changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
> index ef83e4bf2639..eb47c193269c 100644
> --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c
> +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c
> @@ -131,14 +131,14 @@ static const struct of_device_id cpu_opp_match_list[] = {
> static bool dt_has_supported_hw(void)
> {
> bool has_opp_supported_hw = false;
> - struct device_node *np;
> struct device *cpu_dev;
>
> cpu_dev = get_cpu_device(0);
> if (!cpu_dev)
> return false;
>
> - np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
> + struct device_node *np __free(device_node) =
> + dev_pm_opp_of_get_opp_desc_node(cpu_dev);
> if (!np)
> return false;
>
> @@ -149,8 +149,6 @@ static bool dt_has_supported_hw(void)
> }
> }
>
> - of_node_put(np);
> -
> return has_opp_supported_hw;
> }
>
> @@ -165,7 +163,6 @@ static int sun50i_cpufreq_get_efuse(void)
> const struct sunxi_cpufreq_data *opp_data;
> struct nvmem_cell *speedbin_nvmem;
> const struct of_device_id *match;
> - struct device_node *np;
> struct device *cpu_dev;
> u32 *speedbin;
> int ret;
> @@ -174,19 +171,18 @@ static int sun50i_cpufreq_get_efuse(void)
> if (!cpu_dev)
> return -ENODEV;
>
> - np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);
> + struct device_node *np __free(device_node) =
> + dev_pm_opp_of_get_opp_desc_node(cpu_dev);
> if (!np)
> return -ENOENT;
>
> match = of_match_node(cpu_opp_match_list, np);
> - if (!match) {
> - of_node_put(np);
> + if (!match)
> return -ENOENT;
> - }
> +
> opp_data = match->data;
>
> speedbin_nvmem = of_nvmem_cell_get(np, NULL);
> - of_node_put(np);
> if (IS_ERR(speedbin_nvmem))
> return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem),
> "Could not get nvmem cell\n");
> @@ -301,14 +297,9 @@ MODULE_DEVICE_TABLE(of, sun50i_cpufreq_match_list);
>
> static const struct of_device_id *sun50i_cpufreq_match_node(void)
> {
> - const struct of_device_id *match;
> - struct device_node *np;
> -
> - np = of_find_node_by_path("/");
> - match = of_match_node(sun50i_cpufreq_match_list, np);
> - of_node_put(np);
> + struct device_node *np __free(device_node) = of_find_node_by_path("/");
>
> - return match;
> + return of_match_node(sun50i_cpufreq_match_list, np);
> }
>
> /*
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-05-10 17:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 17:52 [PATCH 0/2] cpufreq: sun50i: fix memory leak and remove of_node_put() Javier Carrasco
2024-05-03 17:52 ` [PATCH 1/2] cpufreq: sun50i: fix memory leak in dt_has_supported_hw() Javier Carrasco
2024-05-10 16:49 ` Andre Przywara
2024-05-20 7:33 ` Viresh Kumar
2024-05-20 8:26 ` Andre Przywara
2024-05-20 8:34 ` Viresh Kumar
2024-05-03 17:52 ` [PATCH 2/2] cpufreq: sun50i: replace of_node_put() with automatic cleanup handler Javier Carrasco
2024-05-10 17:42 ` Andre Przywara [this message]
2024-05-20 8:35 ` Viresh Kumar
2024-05-20 9:28 ` Markus Elfring
2024-05-20 9:31 ` Viresh Kumar
2024-05-20 9:32 ` [PATCH 0/2] cpufreq: sun50i: fix memory leak and remove of_node_put() Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240510184213.68f92cab@donnerap.manchester.arm.com \
--to=andre.przywara@arm.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=javier.carrasco.cruz@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=rafael@kernel.org \
--cc=samuel@sholland.org \
--cc=tiny.windzz@gmail.com \
--cc=viresh.kumar@linaro.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).