Messages in this thread Patch in this message |  | | Date | Fri, 26 Jan 2024 12:53:36 -0000 | | From | "tip-bot2 for Bartosz Golaszewski" <> | | Subject | [tip: irq/core] genirq/irq_sim: Shrink code by using cleanup helpers |
| |
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 590610d72a790458431cbbebc71ee24521533b5e Gitweb: https://git.kernel.org/tip/590610d72a790458431cbbebc71ee24521533b5e Author: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> AuthorDate: Mon, 22 Jan 2024 13:42:43 +01:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Fri, 26 Jan 2024 13:44:48 +01:00
genirq/irq_sim: Shrink code by using cleanup helpers
Use the new __free() mechanism to remove all gotos and simplify the error paths.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240122124243.44002-5-brgl@bgdev.pl
--- kernel/irq/irq_sim.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c index b0d50b4..fe8fd30 100644 --- a/kernel/irq/irq_sim.c +++ b/kernel/irq/irq_sim.c @@ -4,6 +4,7 @@ * Copyright (C) 2020 Bartosz Golaszewski <bgolaszewski@baylibre.com> */ +#include <linux/cleanup.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/irq_sim.h> @@ -163,33 +164,27 @@ static const struct irq_domain_ops irq_sim_domain_ops = { struct irq_domain *irq_domain_create_sim(struct fwnode_handle *fwnode, unsigned int num_irqs) { - struct irq_sim_work_ctx *work_ctx; + struct irq_sim_work_ctx *work_ctx __free(kfree) = kmalloc(sizeof(*work_ctx), GFP_KERNEL); + unsigned long *pending; - work_ctx = kmalloc(sizeof(*work_ctx), GFP_KERNEL); if (!work_ctx) - goto err_out; + return ERR_PTR(-ENOMEM); - work_ctx->pending = bitmap_zalloc(num_irqs, GFP_KERNEL); - if (!work_ctx->pending) - goto err_free_work_ctx; + pending = __free(bitmap) = bitmap_zalloc(num_irqs, GFP_KERNEL); + if (!pending) + return ERR_PTR(-ENOMEM); work_ctx->domain = irq_domain_create_linear(fwnode, num_irqs, &irq_sim_domain_ops, work_ctx); if (!work_ctx->domain) - goto err_free_bitmap; + return ERR_PTR(-ENOMEM); work_ctx->irq_count = num_irqs; work_ctx->work = IRQ_WORK_INIT_HARD(irq_sim_handle_irq); + work_ctx->pending = no_free_ptr(pending); - return work_ctx->domain; - -err_free_bitmap: - bitmap_free(work_ctx->pending); -err_free_work_ctx: - kfree(work_ctx); -err_out: - return ERR_PTR(-ENOMEM); + return no_free_ptr(work_ctx)->domain; } EXPORT_SYMBOL_GPL(irq_domain_create_sim);
|  |