From: "Russell King (Oracle)" <linux@armlinux•org.uk>
To: Javier Carrasco <javier.carrasco.cruz@gmail•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
"Rafael J. Wysocki" <rafael@kernel•org>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Jonathan Cameron <jic23@kernel•org>,
Rob Herring <robh@kernel•org>,
Daniel Scally <djrscally@gmail•com>,
Heikki Krogerus <heikki.krogerus@linux•intel.com>,
Sakari Ailus <sakari.ailus@linux•intel.com>,
Jean Delvare <jdelvare@suse•com>,
Guenter Roeck <linux@roeck-us•net>, Pavel Machek <pavel@ucw•cz>,
Lee Jones <lee@kernel•org>,
Marcin Wojtas <marcin.s.wojtas@gmail•com>,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
linux-acpi@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-hwmon@vger•kernel.org, linux-leds@vger•kernel.org,
netdev@vger•kernel.org
Subject: Re: [PATCH 6/6] net: mvpp2: use device_for_each_child_node() to access device child nodes
Date: Mon, 29 Jul 2024 09:23:28 +0100 [thread overview]
Message-ID: <ZqdRgDkK1PzoI2Pf@shell.armlinux.org.uk> (raw)
In-Reply-To: <20240706-device_for_each_child_node-available-v1-6-8a3f7615e41c@gmail.com>
On Sat, Jul 06, 2024 at 05:23:38PM +0200, Javier Carrasco wrote:
> The iterated nodes are direct children of the device node, and the
> `device_for_each_child_node()` macro accounts for child node
> availability.
>
> `fwnode_for_each_available_child_node()` is meant to access the child
> nodes of an fwnode, and therefore not direct child nodes of the device
> node.
>
> The child nodes within mvpp2_probe are not accessed outside the lopps,
"lopps" ?
> and the socped version of the macro can be used to automatically
"socped" ?
> decrement the refcount on early exits.
>
> Use `device_for_each_child_node()` and its scoped variant to indicate
> device's direct child nodes.
>
> Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail•com>
> ---
> drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> index 9adf4301c9b1..97f1faab6f28 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> @@ -7417,8 +7417,6 @@ static int mvpp2_get_sram(struct platform_device *pdev,
>
> static int mvpp2_probe(struct platform_device *pdev)
> {
> - struct fwnode_handle *fwnode = pdev->dev.fwnode;
> - struct fwnode_handle *port_fwnode;
> struct mvpp2 *priv;
> struct resource *res;
> void __iomem *base;
> @@ -7591,7 +7589,7 @@ static int mvpp2_probe(struct platform_device *pdev)
> }
>
> /* Map DTS-active ports. Should be done before FIFO mvpp2_init */
> - fwnode_for_each_available_child_node(fwnode, port_fwnode) {
> + device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
> if (!fwnode_property_read_u32(port_fwnode, "port-id", &i))
> priv->port_map |= BIT(i);
> }
> @@ -7614,7 +7612,7 @@ static int mvpp2_probe(struct platform_device *pdev)
> goto err_axi_clk;
>
> /* Initialize ports */
> - fwnode_for_each_available_child_node(fwnode, port_fwnode) {
> + device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
> err = mvpp2_port_probe(pdev, port_fwnode, priv);
> if (err < 0)
> goto err_port_probe;
> @@ -7653,10 +7651,8 @@ static int mvpp2_probe(struct platform_device *pdev)
> return 0;
>
> err_port_probe:
> - fwnode_handle_put(port_fwnode);
> -
> i = 0;
> - fwnode_for_each_available_child_node(fwnode, port_fwnode) {
> + device_for_each_child_node_scoped(&pdev->dev, port_fwnode) {
> if (priv->port_list[i])
> mvpp2_port_remove(priv->port_list[i]);
> i++;
> @@ -7677,13 +7673,12 @@ static int mvpp2_probe(struct platform_device *pdev)
> static void mvpp2_remove(struct platform_device *pdev)
> {
> struct mvpp2 *priv = platform_get_drvdata(pdev);
> - struct fwnode_handle *fwnode = pdev->dev.fwnode;
> int i = 0, poolnum = MVPP2_BM_POOLS_NUM;
> struct fwnode_handle *port_fwnode;
>
> mvpp2_dbgfs_cleanup(priv);
>
> - fwnode_for_each_available_child_node(fwnode, port_fwnode) {
> + device_for_each_child_node(&pdev->dev, port_fwnode) {
> if (priv->port_list[i]) {
> mutex_destroy(&priv->port_list[i]->gather_stats_lock);
> mvpp2_port_remove(priv->port_list[i]);
This loop is just silly. There is no need to iterate the child nodes.
port_fwnode is not used, and the loop boils down to:
for (i = 0; i < priv->port_count; i++) {
mutex_destroy(&priv->port_list[i]->gather_stats_lock);
mvpp2_port_remove(priv->port_list[i]);
}
Not only is walking the child nodes not necessary, but checking whether
the pointer is NULL is also unnecessary. mvpp2_port_probe() populates
the array using:
priv->port_list[priv->port_count++] = port;
and "port" can not be NULL here, so we're guaranteed that all port_list
entries for 0..priv->port_count will be non-NULL, and the driver makes
this assumption in multiple places.
In fact, I'd say that using fwnode_for_each_available_child_node() or
device_for_each_child_node() is buggy here if the availability of the
children change - it could leave ports not cleaned up.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
next prev parent reply other threads:[~2024-07-29 8:23 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-06 15:23 [PATCH 0/6] use device_for_each_child_node() to access device child nodes Javier Carrasco
2024-07-06 15:23 ` [PATCH 1/6] device property: document device_for_each_child_node macro Javier Carrasco
2024-07-07 16:53 ` Jonathan Cameron
2024-07-06 15:23 ` [PATCH 2/6] hwmon: (ltc2992) use device_for_each_child_node_scoped() to access child nodes Javier Carrasco
2024-07-07 16:55 ` Jonathan Cameron
2024-07-06 15:23 ` [PATCH 3/6] leds: bd2606mvv: use device_for_each_child_node() to access device " Javier Carrasco
2024-07-07 16:57 ` Jonathan Cameron
2024-07-08 8:14 ` Javier Carrasco
2024-07-08 8:28 ` Jonathan Cameron
2024-07-08 15:45 ` Javier Carrasco
2024-07-12 21:06 ` Andreas Kemnade
2024-07-13 21:37 ` Javier Carrasco
2024-07-06 15:23 ` [PATCH 4/6] leds: is31fl319x: use device_for_each_child_node_scoped() to access " Javier Carrasco
2024-07-07 16:58 ` Jonathan Cameron
2024-07-06 15:23 ` [PATCH 5/6] leds: pca995x: use device_for_each_child_node() to access device " Javier Carrasco
2024-07-07 16:59 ` Jonathan Cameron
2024-07-06 15:23 ` [PATCH 6/6] net: mvpp2: " Javier Carrasco
2024-07-07 17:01 ` Jonathan Cameron
2024-07-29 8:23 ` Russell King (Oracle) [this message]
2024-07-29 9:23 ` Javier Carrasco
2024-07-29 13:00 ` Russell King (Oracle)
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=ZqdRgDkK1PzoI2Pf@shell.armlinux.org.uk \
--to=linux@armlinux$(echo .)org.uk \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=davem@davemloft$(echo .)net \
--cc=djrscally@gmail$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=heikki.krogerus@linux$(echo .)intel.com \
--cc=javier.carrasco.cruz@gmail$(echo .)com \
--cc=jdelvare@suse$(echo .)com \
--cc=jic23@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=lee@kernel$(echo .)org \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-hwmon@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-leds@vger$(echo .)kernel.org \
--cc=linux@roeck-us$(echo .)net \
--cc=marcin.s.wojtas@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pavel@ucw$(echo .)cz \
--cc=rafael@kernel$(echo .)org \
--cc=robh@kernel$(echo .)org \
--cc=sakari.ailus@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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