[PATCH net-next 04/14] net: ibm: emac: rgmii: use devm for kzalloc

From: Rosen Penev
Date: Sat Oct 05 2024 - 22:30:07 EST


Simplifies the probe function by removing gotos.

Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
---
drivers/net/ethernet/ibm/emac/rgmii.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c
index 52f080661f87..8c646a5e5c56 100644
--- a/drivers/net/ethernet/ibm/emac/rgmii.c
+++ b/drivers/net/ethernet/ibm/emac/rgmii.c
@@ -219,28 +219,25 @@ static int rgmii_probe(struct platform_device *ofdev)
struct device_node *np = ofdev->dev.of_node;
struct rgmii_instance *dev;
struct resource regs;
- int rc;

- rc = -ENOMEM;
- dev = kzalloc(sizeof(struct rgmii_instance), GFP_KERNEL);
- if (dev == NULL)
- goto err_gone;
+ dev = devm_kzalloc(&ofdev->dev, sizeof(struct rgmii_instance),
+ GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;

mutex_init(&dev->lock);
dev->ofdev = ofdev;

- rc = -ENXIO;
if (of_address_to_resource(np, 0, &regs)) {
printk(KERN_ERR "%pOF: Can't get registers address\n", np);
- goto err_free;
+ return -ENXIO;
}

- rc = -ENOMEM;
dev->base = (struct rgmii_regs __iomem *)ioremap(regs.start,
sizeof(struct rgmii_regs));
if (dev->base == NULL) {
printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
- goto err_free;
+ return -ENOMEM;
}

/* Check for RGMII flags */
@@ -266,11 +263,6 @@ static int rgmii_probe(struct platform_device *ofdev)
platform_set_drvdata(ofdev, dev);

return 0;
-
- err_free:
- kfree(dev);
- err_gone:
- return rc;
}

static void rgmii_remove(struct platform_device *ofdev)
@@ -280,7 +272,6 @@ static void rgmii_remove(struct platform_device *ofdev)
WARN_ON(dev->users != 0);

iounmap(dev->base);
- kfree(dev);
}

static const struct of_device_id rgmii_match[] =
--
2.46.2