From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752290AbdHPOu6 (ORCPT ); Wed, 16 Aug 2017 10:50:58 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51369 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbdHPOuy (ORCPT ); Wed, 16 Aug 2017 10:50:54 -0400 Date: Wed, 16 Aug 2017 07:46:27 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: brgl@bgdev.pl, bamvor.zhangjian@linaro.org, lars@metafoo.de, marc.zyngier@arm.com, hpa@zytor.com, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, corbet@lwn.net, jic23@kernel.org, Jonathan.Cameron@huawei.com, mingo@kernel.org, tglx@linutronix.de Reply-To: hpa@zytor.com, lars@metafoo.de, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, brgl@bgdev.pl, bamvor.zhangjian@linaro.org, tglx@linutronix.de, mingo@kernel.org, Jonathan.Cameron@huawei.com, jic23@kernel.org, corbet@lwn.net In-Reply-To: <20170814145318.6495-3-brgl@bgdev.pl> References: <20170814145318.6495-3-brgl@bgdev.pl> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq/irq_sim: Add a devres variant of irq_sim_init() Git-Commit-ID: 44e72c7ebf294043cfe276f7328b8c0e6a3e50e9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 44e72c7ebf294043cfe276f7328b8c0e6a3e50e9 Gitweb: http://git.kernel.org/tip/44e72c7ebf294043cfe276f7328b8c0e6a3e50e9 Author: Bartosz Golaszewski AuthorDate: Mon, 14 Aug 2017 16:53:17 +0200 Committer: Thomas Gleixner CommitDate: Wed, 16 Aug 2017 16:40:02 +0200 genirq/irq_sim: Add a devres variant of irq_sim_init() Add a resource managed version of irq_sim_init(). This can be conveniently used in device drivers. Signed-off-by: Bartosz Golaszewski Acked-by: Jonathan Cameron Cc: Lars-Peter Clausen Cc: Jonathan Corbet Cc: Marc Zyngier Cc: Linus Walleij Cc: linux-doc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: Bamvor Jian Zhang Cc: Jonathan Cameron Link: http://lkml.kernel.org/r/20170814145318.6495-3-brgl@bgdev.pl Signed-off-by: Thomas Gleixner --- Documentation/driver-model/devres.txt | 1 + include/linux/irq_sim.h | 3 +++ kernel/irq/irq_sim.c | 43 +++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 30e04f7..69f08c0 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -312,6 +312,7 @@ IRQ devm_irq_alloc_descs_from() devm_irq_alloc_generic_chip() devm_irq_setup_generic_chip() + devm_irq_sim_init() LED devm_led_classdev_register() diff --git a/include/linux/irq_sim.h b/include/linux/irq_sim.h index 39ce57b..0380d89 100644 --- a/include/linux/irq_sim.h +++ b/include/linux/irq_sim.h @@ -10,6 +10,7 @@ */ #include +#include /* * Provides a framework for allocating simulated interrupts which can be @@ -34,6 +35,8 @@ struct irq_sim { }; int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs); +int devm_irq_sim_init(struct device *dev, struct irq_sim *sim, + unsigned int num_irqs); void irq_sim_fini(struct irq_sim *sim); void irq_sim_fire(struct irq_sim *sim, unsigned int offset); int irq_sim_irqnum(struct irq_sim *sim, unsigned int offset); diff --git a/kernel/irq/irq_sim.c b/kernel/irq/irq_sim.c index 31a2c12..24caabf 100644 --- a/kernel/irq/irq_sim.c +++ b/kernel/irq/irq_sim.c @@ -10,6 +10,10 @@ #include #include +struct irq_sim_devres { + struct irq_sim *sim; +}; + static void irq_sim_irqmask(struct irq_data *data) { struct irq_sim_irq_ctx *irq_ctx = irq_data_get_irq_chip_data(data); @@ -92,6 +96,45 @@ void irq_sim_fini(struct irq_sim *sim) } EXPORT_SYMBOL_GPL(irq_sim_fini); +static void devm_irq_sim_release(struct device *dev, void *res) +{ + struct irq_sim_devres *this = res; + + irq_sim_fini(this->sim); +} + +/** + * irq_sim_init - Initialize the interrupt simulator for a managed device. + * + * @dev: Device to initialize the simulator object for. + * @sim: The interrupt simulator object to initialize. + * @num_irqs: Number of interrupts to allocate + * + * Returns 0 on success and a negative error number on failure. + */ +int devm_irq_sim_init(struct device *dev, struct irq_sim *sim, + unsigned int num_irqs) +{ + struct irq_sim_devres *dr; + int rv; + + dr = devres_alloc(devm_irq_sim_release, sizeof(*dr), GFP_KERNEL); + if (!dr) + return -ENOMEM; + + rv = irq_sim_init(sim, num_irqs); + if (rv) { + devres_free(dr); + return rv; + } + + dr->sim = sim; + devres_add(dev, dr); + + return 0; +} +EXPORT_SYMBOL_GPL(devm_irq_sim_init); + /** * irq_sim_fire - Enqueue an interrupt. *