@@ -235,29 +235,26 @@ static int zmii_probe(struct platform_device *ofdev)
struct device_node *np = ofdev->dev.of_node;
struct zmii_instance *dev;
struct resource regs;
- int rc;
- rc = -ENOMEM;
- dev = kzalloc(sizeof(struct zmii_instance), GFP_KERNEL);
- if (dev == NULL)
- goto err_gone;
+ dev = devm_kzalloc(&ofdev->dev, sizeof(struct zmii_instance),
+ GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
mutex_init(&dev->lock);
dev->ofdev = ofdev;
dev->mode = PHY_INTERFACE_MODE_NA;
- rc = -ENXIO;
if (of_address_to_resource(np, 0, ®s)) {
printk(KERN_ERR "%pOF: Can't get registers address\n", np);
- goto err_free;
+ return -ENXIO;
}
- rc = -ENOMEM;
dev->base = (struct zmii_regs __iomem *)ioremap(regs.start,
sizeof(struct zmii_regs));
- if (dev->base == NULL) {
+ if (!dev->base) {
printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
- goto err_free;
+ return -ENOMEM;
}
/* We may need FER value for autodetection later */
@@ -271,11 +268,6 @@ static int zmii_probe(struct platform_device *ofdev)
platform_set_drvdata(ofdev, dev);
return 0;
-
- err_free:
- kfree(dev);
- err_gone:
- return rc;
}
static void zmii_remove(struct platform_device *ofdev)
@@ -285,7 +277,6 @@ static void zmii_remove(struct platform_device *ofdev)
WARN_ON(dev->users != 0);
iounmap(dev->base);
- kfree(dev);
}
static const struct of_device_id zmii_match[] =
Simplifies the probe function by removing gotos. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- drivers/net/ethernet/ibm/emac/zmii.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)