net: mvpp2: use port_count to remove ports

As discussed in [1], there is no need to iterate over child nodes to
remove the list of ports. Instead, a loop up to `port_count` ports can
be used, and is in fact more reliable in case the child node
availability changes.

The suggested approach removes the need for the `fwnode` and
`port_fwnode` variables in mvpp2_remove() as well.

Link: https://lore.kernel.org/all/ZqdRgDkK1PzoI2Pf@shell.armlinux.org.uk/
Suggested-by: Russell King <linux@armlinux.org.uk>
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 0d62a33afa80caf687e9175e4ed0d90ce054dc87..0b5b2425de12f0e8272f1b4c6374a4f5469a6254 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -7655,12 +7655,8 @@ static int mvpp2_probe(struct platform_device *pdev)
 err_port_probe:
        fwnode_handle_put(port_fwnode);
 
-       i = 0;
-       fwnode_for_each_available_child_node(fwnode, port_fwnode) {
-               if (priv->port_list[i])
-                       mvpp2_port_remove(priv->port_list[i]);
-               i++;
-       }
+       for (i = 0; i < priv->port_count; i++)
+               mvpp2_port_remove(priv->port_list[i]);
 err_axi_clk:
        clk_disable_unprepare(priv->axi_clk);
 err_mg_core_clk:
@@ -7677,18 +7673,13 @@ err_pp_clk:
 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;
+       int i, poolnum = MVPP2_BM_POOLS_NUM;
 
        mvpp2_dbgfs_cleanup(priv);
 
-       fwnode_for_each_available_child_node(fwnode, port_fwnode) {
-               if (priv->port_list[i]) {
-                       mutex_destroy(&priv->port_list[i]->gather_stats_lock);
-                       mvpp2_port_remove(priv->port_list[i]);
-               }
-               i++;
+       for (i = 0; i < priv->port_count; i++) {
+               mutex_destroy(&priv->port_list[i]->gather_stats_lock);
+               mvpp2_port_remove(priv->port_list[i]);
        }
 
        destroy_workqueue(priv->stats_queue);
@@ -7711,7 +7702,7 @@ static void mvpp2_remove(struct platform_device *pdev)
                                  aggr_txq->descs_dma);
        }
 
-       if (is_acpi_node(port_fwnode))
+       if (!dev_of_node(&pdev->dev))
                return;
 
        clk_disable_unprepare(priv->axi_clk);