5 files changed, 15 insertions, 10 deletions

diff --git a/arch/powerpc/platforms/pasemi/msi.c b/arch/powerpc/platforms/pasemi/msi.c
index e66ef1943338..b304a9fe55cc 100644
--- a/arch/powerpc/platforms/pasemi/msi.c
+++ b/arch/powerpc/platforms/pasemi/msi.c
@@ -63,6 +63,7 @@ static struct irq_chip mpic_pasemi_msi_chip = {
 static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct msi_desc *entry;
+        irq_hw_number_t hwirq;
 
         pr_debug("pasemi_msi_teardown_msi_irqs, pdev %p\n", pdev);
 
@@ -70,10 +71,10 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
+                hwirq = virq_to_hw(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
-                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
-                                       virq_to_hw(entry->irq), ALLOC_CHUNK);
                 irq_dispose_mapping(entry->irq);
+                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, ALLOC_CHUNK);
         }
 
         return;
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index 9b2480b265c0..f2dd77234240 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -99,6 +99,7 @@ void pnv_teardown_msi_irqs(struct pci_dev *pdev)
         struct pci_controller *hose = pci_bus_to_host(pdev->bus);
         struct pnv_phb *phb = hose->private_data;
         struct msi_desc *entry;
+        irq_hw_number_t hwirq;
 
         if (WARN_ON(!phb))
                 return;
@@ -106,10 +107,10 @@ void pnv_teardown_msi_irqs(struct pci_dev *pdev)
         for_each_pci_msi_entry(entry, pdev) {
                 if (entry->irq == NO_IRQ)
                         continue;
+                hwirq = virq_to_hw(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
-                msi_bitmap_free_hwirqs(&phb->msi_bmp,
-                        virq_to_hw(entry->irq) - phb->msi_base, 1);
                 irq_dispose_mapping(entry->irq);
+                msi_bitmap_free_hwirqs(&phb->msi_bmp, hwirq - phb->msi_base, 1);
         }
 }
 #endif /* CONFIG_PCI_MSI */
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 5916da1856a7..48a576aa47b9 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -128,15 +128,16 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct msi_desc *entry;
         struct fsl_msi *msi_data;
+        irq_hw_number_t hwirq;
 
         for_each_pci_msi_entry(entry, pdev) {
                 if (entry->irq == NO_IRQ)
                         continue;
+                hwirq = virq_to_hw(entry->irq);
                 msi_data = irq_get_chip_data(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
-                msi_bitmap_free_hwirqs(&msi_data->bitmap,
-                                       virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
+                msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);
         }
 
         return;
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 70fbd5694a8b..2cbc7e29b85f 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -107,15 +107,16 @@ static u64 find_u4_magic_addr(struct pci_dev *pdev, unsigned int hwirq)
 static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct msi_desc *entry;
+        irq_hw_number_t hwirq;
 
         for_each_pci_msi_entry(entry, pdev) {
                 if (entry->irq == NO_IRQ)
                         continue;
 
+                hwirq = virq_to_hw(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
-                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
-                                       virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
+                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, 1);
         }
 
         return;
diff --git a/arch/powerpc/sysdev/ppc4xx_msi.c b/arch/powerpc/sysdev/ppc4xx_msi.c
index 24d0470c1698..8fb806135043 100644
--- a/arch/powerpc/sysdev/ppc4xx_msi.c
+++ b/arch/powerpc/sysdev/ppc4xx_msi.c
@@ -124,16 +124,17 @@ void ppc4xx_teardown_msi_irqs(struct pci_dev *dev)
 {
         struct msi_desc *entry;
         struct ppc4xx_msi *msi_data = &ppc4xx_msi;
+        irq_hw_number_t hwirq;
 
         dev_dbg(&dev->dev, "PCIE-MSI: tearing down msi irqs\n");
 
         for_each_pci_msi_entry(entry, dev) {
                 if (entry->irq == NO_IRQ)
                         continue;
+                hwirq = virq_to_hw(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
-                msi_bitmap_free_hwirqs(&msi_data->bitmap,
-                                virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
+                msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);
         }
 }