Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa8d4225 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by David S. Miller
Browse files

sh_eth: Use the platform device for memory allocation 



Memory allocated for the MDIO bus with the devm_kzalloc() API is
associated with the network device. While this will cause memory to be
freed at the right time, it doesn't allow allocating memory before the
network device is initialized.

Replace the network device with the parent platform device for memory
allocation to remove that dependency. This also improves consistency
with the other devm_* calls in the driver that all use the platform
device.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54af36e7

drivers/net/ethernet/renesas/sh_eth.c

+3 −4
Original line number Diff line number Diff line
@@ -2606,10 +2606,10 @@ static int sh_mdio_init(struct net_device *ndev, int id, 
	int ret, i;

	struct bb_info *bitbang;

	struct sh_eth_private *mdp = netdev_priv(ndev);

	struct device *dev = &mdp->pdev->dev;



	/* create bit control struct for PHY */

	bitbang = devm_kzalloc(&ndev->dev, sizeof(struct bb_info),

			       GFP_KERNEL);

	bitbang = devm_kzalloc(dev, sizeof(struct bb_info), GFP_KERNEL);

	if (!bitbang) {

		ret = -ENOMEM;

		goto out;
@@ -2638,8 +2638,7 @@ static int sh_mdio_init(struct net_device *ndev, int id, 
		 mdp->pdev->name, id);



	/* PHY IRQ */

	mdp->mii_bus->irq = devm_kzalloc(&ndev->dev,

					 sizeof(int) * PHY_MAX_ADDR,

	mdp->mii_bus->irq = devm_kzalloc(dev, sizeof(int) * PHY_MAX_ADDR,

					 GFP_KERNEL);

	if (!mdp->mii_bus->irq) {

		ret = -ENOMEM;