net: ibm: emac: tah: devm_platform_get_resources

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-4-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 4b325505053b733f4fc648849af368acd34f5f7c..09f6373ed2f90b0ca6c2e4e6b50af56578005505 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -87,9 +87,7 @@ void *tah_dump_regs(struct platform_device *ofdev, void *buf)
 
 static int tah_probe(struct platform_device *ofdev)
 {
-       struct device_node *np = ofdev->dev.of_node;
        struct tah_instance *dev;
-       struct resource regs;
        int err;
 
        dev = devm_kzalloc(&ofdev->dev, sizeof(struct tah_instance),
@@ -103,16 +101,10 @@ static int tah_probe(struct platform_device *ofdev)
 
        dev->ofdev = ofdev;
 
-       if (of_address_to_resource(np, 0, &regs)) {
-               printk(KERN_ERR "%pOF: Can't get registers address\n", np);
-               return -ENXIO;
-       }
-
-       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);
-               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);
        }
 
        platform_set_drvdata(ofdev, dev);
@@ -126,15 +118,6 @@ static int tah_probe(struct platform_device *ofdev)
        return 0;
 }
 
-static void tah_remove(struct platform_device *ofdev)
-{
-       struct tah_instance *dev = platform_get_drvdata(ofdev);
-
-       WARN_ON(dev->users != 0);
-
-       iounmap(dev->base);
-}
-
 static const struct of_device_id tah_match[] =
 {
        {
@@ -153,7 +136,6 @@ static struct platform_driver tah_driver = {
                .of_match_table = tah_match,
        },
        .probe = tah_probe,
-       .remove = tah_remove,
 };
 
 int __init tah_init(void)