[patch V2 13/31] s390/pci: Rework MSI descriptor walk

[Thomas Gleixner]

Replace the about to vanish iterators and make use of the filtering.

Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Tested-by: Niklas Schnelle <schne...@linux.ibm.com>
Acked-by: Niklas Schnelle <schne...@linux.ibm.com>
Cc: linux-s...@vger.kernel.org
Cc: Heiko Carstens <h...@linux.ibm.com>
Cc: Christian Borntraeger <borntrae...@de.ibm.com>
---
 arch/s390/pci/pci_irq.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -303,7 +303,7 @@ int arch_setup_msi_irqs(struct pci_dev *
 
        /* Request MSI interrupts */
        hwirq = bit;
-       for_each_pci_msi_entry(msi, pdev) {
+       msi_for_each_desc(msi, &pdev->dev, MSI_DESC_NOTASSOCIATED) {
                rc = -EIO;
                if (hwirq - bit >= msi_vecs)
                        break;
@@ -362,9 +362,7 @@ void arch_teardown_msi_irqs(struct pci_d
                return;
 
        /* Release MSI interrupts */
-       for_each_pci_msi_entry(msi, pdev) {
-               if (!msi->irq)
-                       continue;
+       msi_for_each_desc(msi, &pdev->dev, MSI_DESC_ASSOCIATED) {
                irq_set_msi_desc(msi->irq, NULL);
                irq_free_desc(msi->irq);
                msi->msg.address_lo = 0;