irqchip/sifive-plic: Use devm_xyz() for managed allocation

Use devm_xyz() for allocations and mappings managed by the
Linux device driver framework.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240222094006.1030709-4-apatel@ventanamicro.com

diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index 892666f0cc7156dee27679fb8dcd551fa4422bd4..299feefa4207e0defb32a5b670023627c491b6fd 100644 (file)
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -436,39 +436,30 @@ static int plic_probe(struct platform_device *pdev)
                        plic_quirks = (unsigned long)id->data;
        }
 
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
        priv->dev = dev;
        priv->plic_quirks = plic_quirks;
 
-       priv->regs = of_iomap(to_of_node(dev->fwnode), 0);
-       if (WARN_ON(!priv->regs)) {
-               error = -EIO;
-               goto out_free_priv;
-       }
+       priv->regs = devm_platform_ioremap_resource(pdev, 0);
+       if (WARN_ON(!priv->regs))
+               return -EIO;
 
-       error = -EINVAL;
        of_property_read_u32(to_of_node(dev->fwnode), "riscv,ndev", &nr_irqs);
        if (WARN_ON(!nr_irqs))
-               goto out_iounmap;
+               return -EINVAL;
 
        priv->nr_irqs = nr_irqs;
 
-       priv->prio_save = bitmap_alloc(nr_irqs, GFP_KERNEL);
+       priv->prio_save = devm_bitmap_zalloc(dev, nr_irqs, GFP_KERNEL);
        if (!priv->prio_save)
-               goto out_free_priority_reg;
+               return -ENOMEM;
 
        nr_contexts = of_irq_count(to_of_node(dev->fwnode));
        if (WARN_ON(!nr_contexts))
-               goto out_free_priority_reg;
-
-       error = -ENOMEM;
-       priv->irqdomain = irq_domain_add_linear(to_of_node(dev->fwnode), nr_irqs + 1,
-                                               &plic_irqdomain_ops, priv);
-       if (WARN_ON(!priv->irqdomain))
-               goto out_free_priority_reg;
+               return -EINVAL;
 
        for (i = 0; i < nr_contexts; i++) {
                struct of_phandle_args parent;
@@ -539,10 +530,10 @@ static int plic_probe(struct platform_device *pdev)
                        i * CONTEXT_ENABLE_SIZE;
                handler->priv = priv;
 
-               handler->enable_save =  kcalloc(DIV_ROUND_UP(nr_irqs, 32),
-                                               sizeof(*handler->enable_save), GFP_KERNEL);
+               handler->enable_save = devm_kcalloc(dev, DIV_ROUND_UP(nr_irqs, 32),
+                                                   sizeof(*handler->enable_save), GFP_KERNEL);
                if (!handler->enable_save)
-                       goto out_free_enable_reg;
+                       return -ENOMEM;
 done:
                for (hwirq = 1; hwirq <= nr_irqs; hwirq++) {
                        plic_toggle(handler, hwirq, 0);
@@ -552,6 +543,11 @@ done:
                nr_handlers++;
        }
 
+       priv->irqdomain = irq_domain_add_linear(to_of_node(dev->fwnode), nr_irqs + 1,
+                                               &plic_irqdomain_ops, priv);
+       if (WARN_ON(!priv->irqdomain))
+               return -ENOMEM;
+
        /*
         * We can have multiple PLIC instances so setup cpuhp state
         * and register syscore operations only once after context
@@ -578,19 +574,6 @@ done:
        dev_info(dev, "mapped %d interrupts with %d handlers for %d contexts.\n",
                 nr_irqs, nr_handlers, nr_contexts);
        return 0;
-
-out_free_enable_reg:
-       for_each_cpu(cpu, cpu_present_mask) {
-               handler = per_cpu_ptr(&plic_handlers, cpu);
-               kfree(handler->enable_save);
-       }
-out_free_priority_reg:
-       kfree(priv->prio_save);
-out_iounmap:
-       iounmap(priv->regs);
-out_free_priv:
-       kfree(priv);
-       return error;
 }
 
 static struct platform_driver plic_driver = {