mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 16:25:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: ibm: emac: zmii: devm_platform_get_resource

Browse Source 
Simplifies the probe function by a bit and allows removing the _remove
function such that devm now handles all cleanup.

printk gets converted to dev_err as np is now gone.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://patch.msgid.link/20241030203727.6039-10-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Rosen Penev
2024-10-30 13:37:24 -07:00
committed by Jakub Kicinski
parent 3fb5272de0
commit c2744ab3ce
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/ethernet/ibm/emac/zmii.c
View File

@@ -232,9 +232,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
static int zmii_probe(struct platform_device *ofdev)
{
struct device_node *np = ofdev->dev.of_node;
struct zmii_instance *dev;
struct resource regs;
int err;
dev = devm_kzalloc(&ofdev->dev, sizeof(struct zmii_instance),
@@ -249,16 +247,10 @@ static int zmii_probe(struct platform_device *ofdev)
dev->ofdev = ofdev;
dev->mode = PHY_INTERFACE_MODE_NA;
if (of_address_to_resource(np, 0, &regs)) {
printk(KERN_ERR "%pOF: Can't get registers address\n", np);
return -ENXIO;
}
dev->base = (struct zmii_regs __iomem *)ioremap(regs.start,
sizeof(struct zmii_regs));
if (!dev->base) {
printk(KERN_ERR "%pOF: Can't map device registers!\n", np);
return -ENOMEM;
dev->base = devm_platform_ioremap_resource(ofdev, 0);
if (IS_ERR(dev->base)) {
dev_err(&ofdev->dev, "can't map device registers");
return PTR_ERR(dev->base);
}
/* We may need FER value for autodetection later */
@@ -274,15 +266,6 @@ static int zmii_probe(struct platform_device *ofdev)
return 0;
}
static void zmii_remove(struct platform_device *ofdev)
{
struct zmii_instance *dev = platform_get_drvdata(ofdev);
WARN_ON(dev->users != 0);
iounmap(dev->base);
}
static const struct of_device_id zmii_match[] =
{
{
@@ -301,7 +284,6 @@ static struct platform_driver zmii_driver = {
.of_match_table = zmii_match,
},
.probe = zmii_probe,
.remove = zmii_remove,
};
int __init zmii_init(void)