Skip to content

Commit

Permalink
bcm63xx_enet: use managed memory allocations
Browse files Browse the repository at this point in the history
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Acked-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jonas Gorski authored and David S. Miller committed Mar 10, 2013
1 parent 1c03da0 commit 2a80b5e
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/ethernet/broadcom/bcm63xx_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
* if a slave is not present on hw */
bus->phy_mask = ~(1 << priv->phy_id);

bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
bus->irq = devm_kzalloc(&pdev->dev, sizeof(int) * PHY_MAX_ADDR,
GFP_KERNEL);
if (!bus->irq) {
ret = -ENOMEM;
goto out_free_mdio;
Expand Down Expand Up @@ -1788,10 +1789,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
return 0;

out_unregister_mdio:
if (priv->mii_bus) {
if (priv->mii_bus)
mdiobus_unregister(priv->mii_bus);
kfree(priv->mii_bus->irq);
}

out_free_mdio:
if (priv->mii_bus)
Expand Down Expand Up @@ -1832,7 +1831,6 @@ static int bcm_enet_remove(struct platform_device *pdev)

if (priv->has_phy) {
mdiobus_unregister(priv->mii_bus);
kfree(priv->mii_bus->irq);
mdiobus_free(priv->mii_bus);
} else {
struct bcm63xx_enet_platform_data *pd;
Expand Down

0 comments on commit 2a80b5e

Please sign in to comment.