Commit dc7c381b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ucc_geth-devm-cleanups' 

Rosen Penev says:

====================
net: ucc_geth: devm cleanups

Also added a small fix for NVMEM mac addresses.

This was tested as working on a Watchguard T10 device.
====================

Link: https://patch.msgid.link/20241104210127.307420-1-rosenp@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fda96035 25758976

drivers/net/ethernet/freescale/ucc_geth.c

+14 −20
Original line number Diff line number Diff line
@@ -3591,22 +3591,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);
@@ -3619,7 +3620,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);

	}
@@ -3687,9 +3688,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;

	}
@@ -3724,15 +3724,17 @@ 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",

			       dev->name);

		goto err_free_netdev;

		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;
@@ -3741,16 +3743,11 @@ 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);

	of_node_put(ug_info->tbi_node);

	of_node_put(ug_info->phy_node);

err_free_info:

	kfree(ug_info);



	return err;

}
@@ -3760,14 +3757,11 @@ 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);

	of_node_put(ugeth->ug_info->tbi_node);

	of_node_put(ugeth->ug_info->phy_node);

	kfree(ugeth->ug_info);

	free_netdev(dev);

}



static const struct of_device_id ucc_geth_match[] = {