From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755684AbaKEQlL (ORCPT ); Wed, 5 Nov 2014 11:41:11 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41403 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755127AbaKEQlH (ORCPT ); Wed, 5 Nov 2014 11:41:07 -0500 Date: Wed, 5 Nov 2014 08:39:59 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, benh@kernel.crashing.org, bp@alien8.de, rjw@rjwysocki.net, gregkh@linuxfoundation.org, bhelgaas@google.com, joro@8bytes.org, yinghai@kernel.org, rdunlap@infradead.org, tglx@linutronix.de, mingo@kernel.org, konrad.wilk@oracle.com, tony.luck@intel.com Reply-To: tglx@linutronix.de, mingo@kernel.org, rdunlap@infradead.org, yinghai@kernel.org, joro@8bytes.org, tony.luck@intel.com, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, hpa@zytor.com, benh@kernel.crashing.org, jiang.liu@linux.intel.com, bhelgaas@google.com, gregkh@linuxfoundation.org, bp@alien8.de, rjw@rjwysocki.net In-Reply-To: <1414397531-28254-19-git-send-email-jiang.liu@linux.intel.com> References: <1414397531-28254-19-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] iommu/vt-d: Use helpers to access irq_cfg data structure associated with IRQ Git-Commit-ID: c20c824715444c9cfad54736e9b41bcae7062d30 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: c20c824715444c9cfad54736e9b41bcae7062d30 Gitweb: http://git.kernel.org/tip/c20c824715444c9cfad54736e9b41bcae7062d30 Author: Jiang Liu AuthorDate: Mon, 27 Oct 2014 16:12:09 +0800 Committer: Thomas Gleixner CommitDate: Wed, 5 Nov 2014 11:04:48 +0100 iommu/vt-d: Use helpers to access irq_cfg data structure associated with IRQ Use helpers to access irq_cfg data structure associated with IRQ, instead of accessing irq_data->chip_data directly. Later we can rewrite those helpers to support hierarchy irqdomain. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Greg Kroah-Hartman Cc: iommu@lists.linux-foundation.org Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Bjorn Helgaas Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Joerg Roedel Link: http://lkml.kernel.org/r/1414397531-28254-19-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- drivers/iommu/intel_irq_remapping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 7c80661..fd181cf 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -55,7 +55,7 @@ static int __init parse_ioapics_under_ir(void); static struct irq_2_iommu *irq_2_iommu(unsigned int irq) { - struct irq_cfg *cfg = irq_get_chip_data(irq); + struct irq_cfg *cfg = irq_cfg(irq); return cfg ? &cfg->irq_2_iommu : NULL; } @@ -86,7 +86,7 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, u16 count) { struct ir_table *table = iommu->ir_table; struct irq_2_iommu *irq_iommu = irq_2_iommu(irq); - struct irq_cfg *cfg = irq_get_chip_data(irq); + struct irq_cfg *cfg = irq_cfg(irq); unsigned int mask = 0; unsigned long flags; int index; @@ -154,7 +154,7 @@ static int map_irq_to_irte_handle(int irq, u16 *sub_handle) static int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle) { struct irq_2_iommu *irq_iommu = irq_2_iommu(irq); - struct irq_cfg *cfg = irq_get_chip_data(irq); + struct irq_cfg *cfg = irq_cfg(irq); unsigned long flags; if (!irq_iommu) @@ -1008,7 +1008,7 @@ static int intel_ioapic_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) { - struct irq_cfg *cfg = data->chip_data; + struct irq_cfg *cfg = irqd_cfg(data); unsigned int dest, irq = data->irq; struct irte irte; int err; @@ -1063,7 +1063,7 @@ static void intel_compose_msi_msg(struct pci_dev *pdev, u16 sub_handle = 0; int ir_index; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); ir_index = map_irq_to_irte_handle(irq, &sub_handle); BUG_ON(ir_index == -1);