Move default_restore_msi_irqs down to reference some static function msi_mask_irq and msix_mask_irq. Tested-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> --- drivers/pci/msi.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index aca7578..87223ae 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -96,26 +96,6 @@ void default_teardown_msi_irqs(struct pci_dev *dev) # define HAVE_DEFAULT_MSI_RESTORE_IRQS #endif -#ifdef HAVE_DEFAULT_MSI_RESTORE_IRQS -void default_restore_msi_irqs(struct pci_dev *dev, int irq) -{ - struct msi_desc *entry; - - entry = NULL; - if (dev->msix_enabled) { - list_for_each_entry(entry, &dev->msi_list, list) { - if (irq == entry->irq) - break; - } - } else if (dev->msi_enabled) { - entry = irq_get_msi_desc(irq); - } - - if (entry) - write_msi_msg(irq, &entry->msg); -} -#endif - static void msi_set_enable(struct pci_dev *dev, int enable) { u16 control; @@ -233,6 +213,26 @@ void unmask_msi_irq(struct irq_data *data) #endif /* CONFIG_GENERIC_HARDIRQS */ +#ifdef HAVE_DEFAULT_MSI_RESTORE_IRQS +void default_restore_msi_irqs(struct pci_dev *dev, int irq) +{ + struct msi_desc *entry; + + entry = NULL; + if (dev->msix_enabled) { + list_for_each_entry(entry, &dev->msi_list, list) { + if (irq == entry->irq) + break; + } + } else if (dev->msi_enabled) { + entry = irq_get_msi_desc(irq); + } + + if (entry) + write_msi_msg(irq, &entry->msg); +} +#endif + void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { BUG_ON(entry->dev->current_state != PCI_D0); -- 1.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html