Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ibm: emac: tah: use devm for kzalloc

Browse Source 
Simplifies the probe function by removing gotos.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241030203727.6039-2-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Rosen Penev 2024-10-30 13:37:16 -07:00 committed by Jakub Kicinski
parent 937677f481
commit 96111f1ec6
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/ibm/emac/tah.c
View File

@ -90,28 +90,25 @@ static int tah_probe(struct platform_device *ofdev)
struct device_node *np = ofdev->dev.of_node;
struct tah_instance *dev;
struct resource regs;
int rc;
rc = -ENOMEM;
dev = kzalloc(sizeof(struct tah_instance), GFP_KERNEL);
if (dev == NULL)
goto err_gone;
dev = devm_kzalloc(&ofdev->dev, sizeof(struct tah_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 tah_regs __iomem *)ioremap(regs.start,
sizeof(struct tah_regs));
if (dev->base == NULL) {
printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
goto err_free;
return -ENOMEM;
}
platform_set_drvdata(ofdev, dev);
@ -123,11 +120,6 @@ static int tah_probe(struct platform_device *ofdev)
wmb();
return 0;
err_free:
kfree(dev);
err_gone:
return rc;
}
static void tah_remove(struct platform_device *ofdev)
@ -137,7 +129,6 @@ static void tah_remove(struct platform_device *ofdev)
WARN_ON(dev->users != 0);
iounmap(dev->base);
kfree(dev);
}
static const struct of_device_id tah_match[] =