[PATCH net-next 0/4] net: ucc_geth: devm cleanups

[PATCH net-next 0/4] net: ucc_geth: devm cleanups

[Rosen Penev]

Also added a small fix for NVMEM mac addresses.

This was tested as working on a Watchguard T10 device.

Rosen Penev (4):
  net: ucc_geth: use devm for kmemdup
  net: ucc_geth: use devm for alloc_etherdev
  net: ucc_geth: use devm for register_netdev
  net: ucc_geth: fix usage with NVMEM MAC address

 drivers/net/ethernet/freescale/ucc_geth.c | 34 ++++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

-- 
2.47.0

[PATCH net-next 1/4] net: ucc_geth: use devm for kmemdup

[Rosen Penev]

Avoids manual frees for it. Funny enough the free in _remove should be
the last thing done.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/freescale/ucc_geth.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index a7dd0a2ead86..4bf5ff5642e7 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3594,22 +3594,23 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 	if ((ucc_num < 0) || (ucc_num > 7))
 		return -ENODEV;
 
-	ug_info = kmemdup(&ugeth_primary_info, sizeof(*ug_info), GFP_KERNEL);
-	if (ug_info == NULL)
+	ug_info = devm_kmemdup(&ofdev->dev, &ugeth_primary_info,
+			       sizeof(*ug_info), GFP_KERNEL);
+	if (!ug_info)
 		return -ENOMEM;
 
 	ug_info->uf_info.ucc_num = ucc_num;
 
 	err = ucc_geth_parse_clock(np, "rx", &ug_info->uf_info.rx_clock);
 	if (err)
-		goto err_free_info;
+		return err;
 	err = ucc_geth_parse_clock(np, "tx", &ug_info->uf_info.tx_clock);
 	if (err)
-		goto err_free_info;
+		return err;
 
 	err = of_address_to_resource(np, 0, &res);
 	if (err)
-		goto err_free_info;
+		return err;
 
 	ug_info->uf_info.regs = res.start;
 	ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
@@ -3622,7 +3623,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 		 */
 		err = of_phy_register_fixed_link(np);
 		if (err)
-			goto err_free_info;
+			return err;
 		ug_info->phy_node = of_node_get(np);
 	}
 
@@ -3751,9 +3752,6 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 		of_phy_deregister_fixed_link(np);
 	of_node_put(ug_info->tbi_node);
 	of_node_put(ug_info->phy_node);
-err_free_info:
-	kfree(ug_info);
-
 	return err;
 }
 
@@ -3769,7 +3767,6 @@ static void ucc_geth_remove(struct platform_device* ofdev)
 		of_phy_deregister_fixed_link(np);
 	of_node_put(ugeth->ug_info->tbi_node);
 	of_node_put(ugeth->ug_info->phy_node);
-	kfree(ugeth->ug_info);
 	free_netdev(dev);
 }
 
-- 
2.47.0

[PATCH net-next 2/4] net: ucc_geth: use devm for alloc_etherdev

[Rosen Penev]

Avoids manual frees. Removes one goto.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/freescale/ucc_geth.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 4bf5ff5642e7..00b868a47fd2 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3691,9 +3691,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 			ug_info->uf_info.irq);
 
 	/* Create an ethernet device instance */
-	dev = alloc_etherdev(sizeof(*ugeth));
-
-	if (dev == NULL) {
+	dev = devm_alloc_etherdev(&ofdev->dev, sizeof(*ugeth));
+	if (!dev) {
 		err = -ENOMEM;
 		goto err_deregister_fixed_link;
 	}
@@ -3733,7 +3732,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 		if (netif_msg_probe(ugeth))
 			pr_err("%s: Cannot register net device, aborting\n",
 			       dev->name);
-		goto err_free_netdev;
+		goto err_deregister_fixed_link;
 	}
 
 	of_get_ethdev_address(np, dev);
@@ -3745,8 +3744,6 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 
 	return 0;
 
-err_free_netdev:
-	free_netdev(dev);
 err_deregister_fixed_link:
 	if (of_phy_is_fixed_link(np))
 		of_phy_deregister_fixed_link(np);
@@ -3767,7 +3764,6 @@ static void ucc_geth_remove(struct platform_device* ofdev)
 		of_phy_deregister_fixed_link(np);
 	of_node_put(ugeth->ug_info->tbi_node);
 	of_node_put(ugeth->ug_info->phy_node);
-	free_netdev(dev);
 }
 
 static const struct of_device_id ucc_geth_match[] = {
-- 
2.47.0

[PATCH net-next 3/4] net: ucc_geth: use devm for register_netdev

[Rosen Penev]

Avoids having to unregister manually.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/freescale/ucc_geth.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 00b868a47fd2..88a9e7db687c 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3727,7 +3727,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 	/* Carrier starts down, phylib will bring it up */
 	netif_carrier_off(dev);
 
-	err = register_netdev(dev);
+	err = devm_register_netdev(&ofdev->dev, dev);
 	if (err) {
 		if (netif_msg_probe(ugeth))
 			pr_err("%s: Cannot register net device, aborting\n",
@@ -3758,7 +3758,6 @@ static void ucc_geth_remove(struct platform_device* ofdev)
 	struct ucc_geth_private *ugeth = netdev_priv(dev);
 	struct device_node *np = ofdev->dev.of_node;
 
-	unregister_netdev(dev);
 	ucc_geth_memclean(ugeth);
 	if (of_phy_is_fixed_link(np))
 		of_phy_deregister_fixed_link(np);
-- 
2.47.0

[PATCH net-next 4/4] net: ucc_geth: fix usage with NVMEM MAC address

[Rosen Penev]

When nvmem is not ready, of_get_ethdev_address returns -EPROBE_DEFER. In
such a case, return -EPROBE_DEFER to avoid not having a proper MAC
address.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 drivers/net/ethernet/freescale/ucc_geth.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 88a9e7db687c..30453a20e467 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3735,7 +3735,9 @@ static int ucc_geth_probe(struct platform_device* ofdev)
 		goto err_deregister_fixed_link;
 	}
 
-	of_get_ethdev_address(np, dev);
+	err = of_get_ethdev_address(np, dev);
+	if (err == -EPROBE_DEFER)
+		goto err_deregister_fixed_link;
 
 	ugeth->ug_info = ug_info;
 	ugeth->dev = device;
-- 
2.47.0

Re: [PATCH net-next 0/4] net: ucc_geth: devm cleanups

[Rosen Penev]

On Mon, Nov 4, 2024 at 1:01 PM Rosen Penev <rosenp@gmail.com> wrote:
>
> Also added a small fix for NVMEM mac addresses.
>
> This was tested as working on a Watchguard T10 device.
>
> Rosen Penev (4):
>   net: ucc_geth: use devm for kmemdup
>   net: ucc_geth: use devm for alloc_etherdev
>   net: ucc_geth: use devm for register_netdev
>   net: ucc_geth: fix usage with NVMEM MAC address
oh this is interesting

_remove calls platform_get_drvdata but platform_set_drvdata never gets
called. I believe that means _remove is operating on a NULL pointer.
>
>  drivers/net/ethernet/freescale/ucc_geth.c | 34 ++++++++++-------------
>  1 file changed, 14 insertions(+), 20 deletions(-)
>
> --
> 2.47.0
>

Re: [PATCH net-next 0/4] net: ucc_geth: devm cleanups

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon,  4 Nov 2024 13:01:23 -0800 you wrote:
> Also added a small fix for NVMEM mac addresses.
> 
> This was tested as working on a Watchguard T10 device.
> 
> Rosen Penev (4):
>   net: ucc_geth: use devm for kmemdup
>   net: ucc_geth: use devm for alloc_etherdev
>   net: ucc_geth: use devm for register_netdev
>   net: ucc_geth: fix usage with NVMEM MAC address
> 
> [...]

Here is the summary with links:
  - [net-next,1/4] net: ucc_geth: use devm for kmemdup
    https://git.kernel.org/netdev/net-next/c/2246f5b2e982
  - [net-next,2/4] net: ucc_geth: use devm for alloc_etherdev
    https://git.kernel.org/netdev/net-next/c/edf0e374e446
  - [net-next,3/4] net: ucc_geth: use devm for register_netdev
    https://git.kernel.org/netdev/net-next/c/85d05befbbfc
  - [net-next,4/4] net: ucc_geth: fix usage with NVMEM MAC address
    https://git.kernel.org/netdev/net-next/c/257589764032

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html