From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755867AbaKEQmg (ORCPT ); Wed, 5 Nov 2014 11:42:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41429 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755829AbaKEQmR (ORCPT ); Wed, 5 Nov 2014 11:42:17 -0500 Date: Wed, 5 Nov 2014 08:40:15 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: mingo@kernel.org, jiang.liu@linux.intel.com, rjw@rjwysocki.net, joro@8bytes.org, yinghai@kernel.org, gregkh@linuxfoundation.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@alien8.de, tony.luck@intel.com, konrad.wilk@oracle.com, rdunlap@infradead.org, benh@kernel.crashing.org, bhelgaas@google.com Reply-To: mingo@kernel.org, jiang.liu@linux.intel.com, joro@8bytes.org, rjw@rjwysocki.net, gregkh@linuxfoundation.org, yinghai@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@alien8.de, tony.luck@intel.com, konrad.wilk@oracle.com, rdunlap@infradead.org, benh@kernel.crashing.org, bhelgaas@google.com In-Reply-To: <1414397531-28254-20-git-send-email-jiang.liu@linux.intel.com> References: <1414397531-28254-20-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] iommu/amd: Use helpers to access irq_cfg data structure associated with IRQ Git-Commit-ID: 18fbf8bb8b5341da3f254e62c5a21ef87ecf6b00 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: 18fbf8bb8b5341da3f254e62c5a21ef87ecf6b00 Gitweb: http://git.kernel.org/tip/18fbf8bb8b5341da3f254e62c5a21ef87ecf6b00 Author: Jiang Liu AuthorDate: Mon, 27 Oct 2014 16:12:10 +0800 Committer: Thomas Gleixner CommitDate: Wed, 5 Nov 2014 11:04:48 +0100 iommu/amd: 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-20-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- drivers/iommu/amd_iommu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 505a9ad..6fda7cc 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -4068,7 +4068,7 @@ static int setup_ioapic_entry(int irq, struct IO_APIC_route_entry *entry, int devid; int ret; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return -EINVAL; @@ -4131,7 +4131,7 @@ static int set_affinity(struct irq_data *data, const struct cpumask *mask, if (!config_enabled(CONFIG_SMP)) return -1; - cfg = data->chip_data; + cfg = irqd_cfg(data); irq = data->irq; irte_info = &cfg->irq_2_irte; @@ -4169,7 +4169,7 @@ static int free_irq(int irq) struct irq_2_irte *irte_info; struct irq_cfg *cfg; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return -EINVAL; @@ -4188,7 +4188,7 @@ static void compose_msi_msg(struct pci_dev *pdev, struct irq_cfg *cfg; union irte irte; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return; @@ -4217,7 +4217,7 @@ static int msi_alloc_irq(struct pci_dev *pdev, int irq, int nvec) if (!pdev) return -EINVAL; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return -EINVAL; @@ -4237,7 +4237,7 @@ static int msi_setup_irq(struct pci_dev *pdev, unsigned int irq, if (!pdev) return -EINVAL; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return -EINVAL; @@ -4260,7 +4260,7 @@ static int alloc_hpet_msi(unsigned int irq, unsigned int id) struct irq_cfg *cfg; int index, devid; - cfg = irq_get_chip_data(irq); + cfg = irq_cfg(irq); if (!cfg) return -EINVAL;