Use devm for kzalloc. Allows to remove free_gfar_dev as devm handles
freeing it now.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.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 4b023beaa0b1..4799779c9cbe 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;
}
@@ -820,7 +809,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;
}
@@ -3364,7 +3352,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;
}
@@ -3382,7 +3369,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.47.0