iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Anup Patel 2024-02-22 15:09:51 +05:30 committed by Thomas Gleixner
parent 25d862e183
commit b68d0ff529
1 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/irqchip/irq-sifive-plic.c
View File

@ -436,39 +436,30 @@ static int plic_probe(struct platform_device *pdev)
plic_quirks = (unsigned long)id->data; plic_quirks = (unsigned long)id->data;
} }
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->dev = dev; priv->dev = dev;
priv->plic_quirks = plic_quirks; priv->plic_quirks = plic_quirks;
priv->regs = of_iomap(to_of_node(dev->fwnode), 0); priv->regs = devm_platform_ioremap_resource(pdev, 0);
if (WARN_ON(!priv->regs)) { if (WARN_ON(!priv->regs))
error = -EIO; return -EIO;
goto out_free_priv;
}
error = -EINVAL;
of_property_read_u32(to_of_node(dev->fwnode), "riscv,ndev", &nr_irqs); of_property_read_u32(to_of_node(dev->fwnode), "riscv,ndev", &nr_irqs);
if (WARN_ON(!nr_irqs)) if (WARN_ON(!nr_irqs))
goto out_iounmap; return -EINVAL;
priv->nr_irqs = nr_irqs; 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) if (!priv->prio_save)
goto out_free_priority_reg; return -ENOMEM;
nr_contexts = of_irq_count(to_of_node(dev->fwnode)); nr_contexts = of_irq_count(to_of_node(dev->fwnode));
if (WARN_ON(!nr_contexts)) if (WARN_ON(!nr_contexts))
goto out_free_priority_reg; return -EINVAL;
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;
for (i = 0; i < nr_contexts; i++) { for (i = 0; i < nr_contexts; i++) {
struct of_phandle_args parent; struct of_phandle_args parent;
@ -539,10 +530,10 @@ static int plic_probe(struct platform_device *pdev)
i * CONTEXT_ENABLE_SIZE; i * CONTEXT_ENABLE_SIZE;
handler->priv = priv; handler->priv = priv;
handler->enable_save = kcalloc(DIV_ROUND_UP(nr_irqs, 32), handler->enable_save = devm_kcalloc(dev, DIV_ROUND_UP(nr_irqs, 32),
sizeof(*handler->enable_save), GFP_KERNEL); sizeof(*handler->enable_save), GFP_KERNEL);
if (!handler->enable_save) if (!handler->enable_save)
goto out_free_enable_reg; return -ENOMEM;
done: done:
for (hwirq = 1; hwirq <= nr_irqs; hwirq++) { for (hwirq = 1; hwirq <= nr_irqs; hwirq++) {
plic_toggle(handler, hwirq, 0); plic_toggle(handler, hwirq, 0);
@ -552,6 +543,11 @@ done:
nr_handlers++; 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 * We can have multiple PLIC instances so setup cpuhp state
* and register syscore operations only once after context * 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", dev_info(dev, "mapped %d interrupts with %d handlers for %d contexts.\n",
nr_irqs, nr_handlers, nr_contexts); nr_irqs, nr_handlers, nr_contexts);
return 0; 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 = { static struct platform_driver plic_driver = {