From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756763AbbDXPpS (ORCPT ); Fri, 24 Apr 2015 11:45:18 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43652 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751702AbbDXPpL (ORCPT ); Fri, 24 Apr 2015 11:45:11 -0400 Date: Fri, 24 Apr 2015 08:44:05 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: gregkh@linuxfoundation.org, hpa@zytor.com, konrad.wilk@oracle.com, mingo@kernel.org, bp@alien8.de, linux-kernel@vger.kernel.org, david.a.cohen@linux.intel.com, srivatsa.bhat@linux.vnet.ibm.com, rdunlap@infradead.org, tony.luck@intel.com, tglx@linutronix.de, joro@8bytes.org, benh@kernel.crashing.org, luto@amacapital.net, rjw@rjwysocki.net, yinghai@kernel.org, david.vrabel@citrix.com, sivanich@sgi.com, bhelgaas@google.com, jiang.liu@linux.intel.com, linux@eikelenboom.it Reply-To: bp@alien8.de, mingo@kernel.org, linux-kernel@vger.kernel.org, rdunlap@infradead.org, david.a.cohen@linux.intel.com, srivatsa.bhat@linux.vnet.ibm.com, tglx@linutronix.de, tony.luck@intel.com, hpa@zytor.com, gregkh@linuxfoundation.org, konrad.wilk@oracle.com, sivanich@sgi.com, bhelgaas@google.com, linux@eikelenboom.it, jiang.liu@linux.intel.com, joro@8bytes.org, benh@kernel.crashing.org, luto@amacapital.net, rjw@rjwysocki.net, yinghai@kernel.org, david.vrabel@citrix.com In-Reply-To: <1416894816-23245-4-git-send-email-jiang.liu@linux.intel.com> References: <1416894816-23245-4-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/hpet: Use new irqdomain interfaces to allocate /free IRQ Git-Commit-ID: bd8eb63f8a3907bb477992145cb6ce0064a1e43f 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: bd8eb63f8a3907bb477992145cb6ce0064a1e43f Gitweb: http://git.kernel.org/tip/bd8eb63f8a3907bb477992145cb6ce0064a1e43f Author: Jiang Liu AuthorDate: Mon, 13 Apr 2015 14:11:25 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:48 +0200 x86/hpet: Use new irqdomain interfaces to allocate/free IRQ Use new irqdomain interfaces to allocate/free IRQ for HPET, so we can remove GENERIC_IRQ_LEGACY_ALLOC_HWIRQ later. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Srivatsa S. Bhat Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Cc: Andy Lutomirski Link: http://lkml.kernel.org/r/1416894816-23245-4-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/hpet.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 3acbff4..ae29554 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -476,7 +477,7 @@ static int hpet_msi_next_event(unsigned long delta, static int hpet_setup_msi_irq(unsigned int irq) { if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) { - irq_free_hwirq(irq); + irq_domain_free_irqs(irq, 1); return -EINVAL; } return 0; @@ -484,9 +485,10 @@ static int hpet_setup_msi_irq(unsigned int irq) static int hpet_assign_irq(struct hpet_dev *dev) { - unsigned int irq = irq_alloc_hwirq(-1); + int irq; - if (!irq) + irq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, NULL); + if (irq <= 0) return -EINVAL; irq_set_handler_data(irq, dev);