From: Rosen Penev <rosenp@gmail.com>
To: netdev@vger.kernel.org
Cc: andrew@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org,
claudiu.manoil@nxp.com
Subject: [PATCH net-next 2/6] net: gianfar: remove free_gfar_dev
Date: Tue, 1 Oct 2024 14:22:00 -0700 [thread overview]
Message-ID: <20241001212204.308758-3-rosenp@gmail.com> (raw)
In-Reply-To: <20241001212204.308758-1-rosenp@gmail.com>
Can be completely removed with devm.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
drivers/net/ethernet/freescale/gianfar.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index b0f65cdf4872..9f0824f0b2d1 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -466,17 +466,6 @@ static void unmap_group_regs(struct gfar_private *priv)
iounmap(priv->gfargrp[i].regs);
}
-static void free_gfar_dev(struct gfar_private *priv)
-{
- int i, j;
-
- for (i = 0; i < priv->num_grps; i++)
- for (j = 0; j < GFAR_NUM_IRQS; j++) {
- kfree(priv->gfargrp[i].irqinfo[j]);
- priv->gfargrp[i].irqinfo[j] = NULL;
- }
-}
-
static void disable_napi(struct gfar_private *priv)
{
int i;
@@ -504,8 +493,8 @@ static int gfar_parse_group(struct device_node *np,
int i;
for (i = 0; i < GFAR_NUM_IRQS; i++) {
- grp->irqinfo[i] = kzalloc(sizeof(struct gfar_irqinfo),
- GFP_KERNEL);
+ grp->irqinfo[i] = devm_kzalloc(
+ priv->dev, sizeof(struct gfar_irqinfo), GFP_KERNEL);
if (!grp->irqinfo[i])
return -ENOMEM;
}
@@ -818,7 +807,6 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
gfar_free_rx_queues(priv);
tx_alloc_failed:
gfar_free_tx_queues(priv);
- free_gfar_dev(priv);
return err;
}
@@ -3361,7 +3349,6 @@ static int gfar_probe(struct platform_device *ofdev)
gfar_free_tx_queues(priv);
of_node_put(priv->phy_node);
of_node_put(priv->tbi_node);
- free_gfar_dev(priv);
return err;
}
@@ -3381,7 +3368,6 @@ static void gfar_remove(struct platform_device *ofdev)
unmap_group_regs(priv);
gfar_free_rx_queues(priv);
gfar_free_tx_queues(priv);
- free_gfar_dev(priv);
}
#ifdef CONFIG_PM
--
2.46.2
next prev parent reply other threads:[~2024-10-01 21:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 21:21 [PATCH net-next 0/6] gianfar cleanups Rosen Penev
2024-10-01 21:21 ` [PATCH net-next 1/6] net: gianfar: use devm_alloc_etherdev_mqs Rosen Penev
2024-10-02 7:15 ` Maxime Chevallier
2024-10-01 21:22 ` Rosen Penev [this message]
2024-10-02 7:23 ` [PATCH net-next 2/6] net: gianfar: remove free_gfar_dev Maxime Chevallier
2024-10-01 21:22 ` [PATCH net-next 3/6] net: gianfar: allocate queues with devm Rosen Penev
2024-10-02 7:25 ` Maxime Chevallier
2024-10-04 6:31 ` Claudiu Manoil
2024-10-01 21:22 ` [PATCH net-next 4/6] net: gianfar: use devm for register_netdev Rosen Penev
2024-10-02 7:29 ` Maxime Chevallier
2024-10-02 19:40 ` Rosen Penev
2024-10-01 21:22 ` [PATCH net-next 5/6] net: gianfar: use devm for request_irq Rosen Penev
2024-10-02 7:37 ` Maxime Chevallier
2024-10-02 19:29 ` Rosen Penev
2024-10-02 21:32 ` Andrew Lunn
2024-10-03 19:37 ` Claudiu Manoil
2024-10-01 21:22 ` [PATCH net-next 6/6] net: gianfar: use devm for of_iomap Rosen Penev
2024-10-02 7:47 ` Maxime Chevallier
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=20241001212204.308758-3-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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: link
Be 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.