diff options
| author | DuanZhenzhong <zhenzhong.duan@oracle.com> | 2013-12-04 13:09:16 +0800 |
|---|---|---|
| committer | Richard Zhu <Richard.Zhu@freescale.com> | 2014-11-07 12:55:23 +0800 |
| commit | 8258ddab2f797b7d463eb239571bb2c866070ee9 (patch) | |
| tree | aa71f7980bb3b521adbcdb39e7a0819b01a79420 /include | |
| parent | 6c62ffc692871859885c452e3dda0fe296db5f5b (diff) | |
PCI: Drop "irq" param from *_restore_msi_irqs()
Change x86_msi.restore_msi_irqs(struct pci_dev *dev, int irq) to
x86_msi.restore_msi_irqs(struct pci_dev *dev).
restore_msi_irqs() restores multiple MSI-X IRQs, so param 'int irq' is
unneeded. This makes code more consistent between vm and bare metal.
Dom0 MSI-X restore code can also be optimized as XEN only has a hypercall
to restore all MSI-X vectors at one time.
Tested-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Conflicts:
drivers/pci/msi.c
(cherry picked from commit 41b4d5f3cf3537cfd31e85e68df29640a6fbe571)
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/msi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index 87cce50bd121..911c2eb2f3af 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -60,10 +60,10 @@ void arch_teardown_msi_irq(unsigned int irq); int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type); void arch_teardown_msi_irqs(struct pci_dev *dev); int arch_msi_check_device(struct pci_dev* dev, int nvec, int type); -void arch_restore_msi_irqs(struct pci_dev *dev, int irq); +void arch_restore_msi_irqs(struct pci_dev *dev); void default_teardown_msi_irqs(struct pci_dev *dev); -void default_restore_msi_irqs(struct pci_dev *dev, int irq); +void default_restore_msi_irqs(struct pci_dev *dev); u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag); u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag); |