From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbdBLSw2 (ORCPT ); Sun, 12 Feb 2017 13:52:28 -0500 Received: from terminus.zytor.com ([65.50.211.136]:41798 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751241AbdBLSw1 (ORCPT ); Sun, 12 Feb 2017 13:52:27 -0500 Date: Sun, 12 Feb 2017 10:52:16 -0800 From: tip-bot for Heiner Kallweit Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hkallweit1@gmail.com, mingo@kernel.org Reply-To: hkallweit1@gmail.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <05c63d67-30b4-7026-02d5-ce7fb7bc185f@gmail.com> References: <05c63d67-30b4-7026-02d5-ce7fb7bc185f@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq/devres: Use dev_name(dev) as default for devname Git-Commit-ID: 899b5fbf9d3fcb721690b4d58cf58cc018517003 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: 899b5fbf9d3fcb721690b4d58cf58cc018517003 Gitweb: http://git.kernel.org/tip/899b5fbf9d3fcb721690b4d58cf58cc018517003 Author: Heiner Kallweit AuthorDate: Sun, 12 Feb 2017 16:31:44 +0100 Committer: Thomas Gleixner CommitDate: Sun, 12 Feb 2017 19:49:25 +0100 genirq/devres: Use dev_name(dev) as default for devname Allow the devname parameter to be NULL and use dev_name(dev) in this case. This should be an appropriate default for most use cases. Signed-off-by: Heiner Kallweit Link: http://lkml.kernel.org/r/05c63d67-30b4-7026-02d5-ce7fb7bc185f@gmail.com Signed-off-by: Thomas Gleixner --- kernel/irq/devres.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c index 18babef..1613bfd 100644 --- a/kernel/irq/devres.c +++ b/kernel/irq/devres.c @@ -34,7 +34,7 @@ static int devm_irq_match(struct device *dev, void *res, void *data) * @thread_fn: function to be called in a threaded interrupt context. NULL * for devices which handle everything in @handler * @irqflags: Interrupt type flags - * @devname: An ascii name for the claiming device + * @devname: An ascii name for the claiming device, dev_name(dev) if NULL * @dev_id: A cookie passed back to the handler function * * Except for the extra @dev argument, this function takes the @@ -58,6 +58,9 @@ int devm_request_threaded_irq(struct device *dev, unsigned int irq, if (!dr) return -ENOMEM; + if (!devname) + devname = dev_name(dev); + rc = request_threaded_irq(irq, handler, thread_fn, irqflags, devname, dev_id); if (rc) { @@ -81,7 +84,7 @@ EXPORT_SYMBOL(devm_request_threaded_irq); * @thread_fn: function to be called in a threaded interrupt context. NULL * for devices which handle everything in @handler * @irqflags: Interrupt type flags - * @devname: An ascii name for the claiming device + * @devname: An ascii name for the claiming device, dev_name(dev) if NULL * @dev_id: A cookie passed back to the handler function * * Except for the extra @dev argument, this function takes the @@ -104,6 +107,9 @@ int devm_request_any_context_irq(struct device *dev, unsigned int irq, if (!dr) return -ENOMEM; + if (!devname) + devname = dev_name(dev); + rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id); if (rc < 0) { devres_free(dr);