From: Jiang Liu <jiang.liu@linux.intel.com>
Date: Thu, 6 Nov 2014 14:20:33 +0000 (+0800)
Subject: PCI/MSI: Kill redundant call of irq_set_msi_desc() for MSI-X interrupts
X-Git-Tag: Ubuntu-5.2.0-15.16~12243^2~47
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d71d6432e105fe80d33f930276bb146be4732330;p=mirror_ubuntu-eoan-kernel.git

PCI/MSI: Kill redundant call of irq_set_msi_desc() for MSI-X interrupts

It is the repsonsibility of arch_setup_msi_irq()/arch_setup_msi_irqs()
to call irq_set_msi_desc() to associate IRQ descriptors and MSI
descriptors. Kill the redundant call of irq_set_msi_desc() for MSI-X
interrupts in the PCI MSI core.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Yingjoe Chen <yingjoe.chen@mediatek.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index df0170b8da73..5cb471ec3e61 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -695,7 +695,6 @@ static void msix_program_entries(struct pci_dev *dev,
 						PCI_MSIX_ENTRY_VECTOR_CTRL;
 
 		entries[i].vector = entry->irq;
-		irq_set_msi_desc(entry->irq, entry);
 		entry->masked = readl(entry->mask_base + offset);
 		msix_mask_irq(entry, 1);
 		i++;