From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Ben Dooks <ben.dooks@codethink.co.uk> Subject: [PATCH 1/5] sh_eth: Use the platform device for memory allocation Date: Thu, 20 Mar 2014 13:59:17 +0000 [thread overview] Message-ID: <1395324035-22918-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1395324035-22918-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/net/ethernet/renesas/sh_eth.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index efaca6d..f669e2a 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -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; -- 1.8.3.2
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, Ben Dooks <ben.dooks@codethink.co.uk> Subject: [PATCH 1/5] sh_eth: Use the platform device for memory allocation Date: Thu, 20 Mar 2014 15:00:31 +0100 [thread overview] Message-ID: <1395324035-22918-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com> (raw) In-Reply-To: <1395324035-22918-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/net/ethernet/renesas/sh_eth.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index efaca6d..f669e2a 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -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; -- 1.8.3.2
next prev parent reply other threads:[~2014-03-20 13:59 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-20 13:58 [PATCH 0/5] sh_eth: Fix the race between open and MDIO bus registration Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 5/5] sh_eth: Remove goto statements that jump straight to a return Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 4/5] sh_eth: Register MDIO bus before registering the network device Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` Laurent Pinchart [this message] 2014-03-20 14:00 ` [PATCH 1/5] sh_eth: Use the platform device for memory allocation Laurent Pinchart 2014-03-20 13:59 ` [PATCH 2/5] sh_eth: Use the platform device as the MDIO bus parent Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 13:59 ` [PATCH 3/5] sh_eth: Simplify MDIO bus initialization and release Laurent Pinchart 2014-03-20 14:00 ` Laurent Pinchart 2014-03-20 15:31 ` Sergei Shtylyov 2014-03-20 15:31 ` Sergei Shtylyov 2014-03-20 21:22 ` [PATCH 0/5] sh_eth: Fix the race between open and MDIO bus registration David Miller 2014-03-20 21:22 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1395324035-22918-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com \ --to=laurent.pinchart+renesas@ideasonboard.com \ --cc=ben.dooks@codethink.co.uk \ --cc=linux-sh@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sergei.shtylyov@cogentembedded.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.