From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755657AbaKEQkz (ORCPT ); Wed, 5 Nov 2014 11:40:55 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41392 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755628AbaKEQkx (ORCPT ); Wed, 5 Nov 2014 11:40:53 -0500 Date: Wed, 5 Nov 2014 08:39:42 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: gregkh@linuxfoundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tony.luck@intel.com, yinghai@kernel.org, bhelgaas@google.com, rjw@rjwysocki.net, tglx@linutronix.de, rdunlap@infradead.org, benh@kernel.crashing.org, hpa@zytor.com, joro@8bytes.org, bp@alien8.de, jiang.liu@linux.intel.com, konrad.wilk@oracle.com Reply-To: yinghai@kernel.org, gregkh@linuxfoundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tony.luck@intel.com, joro@8bytes.org, bp@alien8.de, konrad.wilk@oracle.com, jiang.liu@linux.intel.com, bhelgaas@google.com, rjw@rjwysocki.net, tglx@linutronix.de, rdunlap@infradead.org, benh@kernel.crashing.org, hpa@zytor.com In-Reply-To: <1414397531-28254-18-git-send-email-jiang.liu@linux.intel.com> References: <1414397531-28254-18-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86: irq_remapping: Use helpers to access irq_cfg data structure associated with IRQ Git-Commit-ID: e311d98bb54f7b35a07466f314d0961b913dbe2c 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: e311d98bb54f7b35a07466f314d0961b913dbe2c Gitweb: http://git.kernel.org/tip/e311d98bb54f7b35a07466f314d0961b913dbe2c Author: Jiang Liu AuthorDate: Mon, 27 Oct 2014 16:12:08 +0800 Committer: Thomas Gleixner CommitDate: Wed, 5 Nov 2014 11:04:48 +0100 x86: irq_remapping: 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-18-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- drivers/iommu/irq_remapping.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c index 74a1767..e9fbd68 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c @@ -306,7 +306,7 @@ static int set_remapped_irq_affinity(struct irq_data *data, void free_remapped_irq(int irq) { - struct irq_cfg *cfg = irq_get_chip_data(irq); + struct irq_cfg *cfg = irq_cfg(irq); if (!remap_ops || !remap_ops->free_irq) return; @@ -319,7 +319,7 @@ void compose_remapped_msi_msg(struct pci_dev *pdev, unsigned int irq, unsigned int dest, struct msi_msg *msg, u8 hpet_id) { - struct irq_cfg *cfg = irq_get_chip_data(irq); + struct irq_cfg *cfg = irq_cfg(irq); if (!irq_remapped(cfg)) native_compose_msi_msg(pdev, irq, dest, msg, hpet_id); @@ -372,7 +372,7 @@ static void ir_ack_apic_edge(struct irq_data *data) static void ir_ack_apic_level(struct irq_data *data) { ack_APIC_irq(); - eoi_ioapic_irq(data->irq, data->chip_data); + eoi_ioapic_irq(data->irq, irqd_cfg(data)); } static void ir_print_prefix(struct irq_data *data, struct seq_file *p)