Commit 2a80b5e1 authored by Jonas Gorski's avatar Jonas Gorski Committed by David S. Miller

bcm63xx_enet: use managed memory allocations

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Acked-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c03da05
...@@ -1727,7 +1727,8 @@ static int bcm_enet_probe(struct platform_device *pdev) ...@@ -1727,7 +1727,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
* if a slave is not present on hw */ * if a slave is not present on hw */
bus->phy_mask = ~(1 << priv->phy_id); 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) { if (!bus->irq) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_free_mdio; goto out_free_mdio;
...@@ -1788,10 +1789,8 @@ static int bcm_enet_probe(struct platform_device *pdev) ...@@ -1788,10 +1789,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
return 0; return 0;
out_unregister_mdio: out_unregister_mdio:
if (priv->mii_bus) { if (priv->mii_bus)
mdiobus_unregister(priv->mii_bus); mdiobus_unregister(priv->mii_bus);
kfree(priv->mii_bus->irq);
}
out_free_mdio: out_free_mdio:
if (priv->mii_bus) if (priv->mii_bus)
...@@ -1832,7 +1831,6 @@ static int bcm_enet_remove(struct platform_device *pdev) ...@@ -1832,7 +1831,6 @@ static int bcm_enet_remove(struct platform_device *pdev)
if (priv->has_phy) { if (priv->has_phy) {
mdiobus_unregister(priv->mii_bus); mdiobus_unregister(priv->mii_bus);
kfree(priv->mii_bus->irq);
mdiobus_free(priv->mii_bus); mdiobus_free(priv->mii_bus);
} else { } else {
struct bcm63xx_enet_platform_data *pd; struct bcm63xx_enet_platform_data *pd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment