From patchwork Sun Mar 10 13:57:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 226439 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8B79B2C0313 for ; Mon, 11 Mar 2013 00:58:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751738Ab3CJN6D (ORCPT ); Sun, 10 Mar 2013 09:58:03 -0400 Received: from arrakis.dune.hu ([78.24.191.176]:50580 "EHLO arrakis.dune.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751335Ab3CJN6B (ORCPT ); Sun, 10 Mar 2013 09:58:01 -0400 Received: from arrakis.dune.hu ([127.0.0.1]) by localhost (arrakis.dune.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bfAS_qx1LoQ5; Sun, 10 Mar 2013 14:57:35 +0100 (CET) Received: from shaker64.lan (dslb-088-073-022-195.pools.arcor-ip.net [88.73.22.195]) by arrakis.dune.hu (Postfix) with ESMTPSA id AA9F42804C8; Sun, 10 Mar 2013 14:57:34 +0100 (CET) From: Jonas Gorski To: netdev@vger.kernel.org Cc: "David S. Miller" , Maxime Bizon , Florian Fainelli , Kevin Cernekee Subject: [PATCH 2/3] bcm63xx_enet: use managed memory allocations Date: Sun, 10 Mar 2013 14:57:48 +0100 Message-Id: <1362923869-21346-2-git-send-email-jogo@openwrt.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362923869-21346-1-git-send-email-jogo@openwrt.org> References: <1362923869-21346-1-git-send-email-jogo@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 0a43188..8397d1c 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1742,7 +1742,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; @@ -1803,10 +1804,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) @@ -1847,7 +1846,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;