powerpc/4xx/hsta: Rework MSI handling

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

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211206210748.359766435@linutronix.de

diff --git a/arch/powerpc/platforms/4xx/hsta_msi.c b/arch/powerpc/platforms/4xx/hsta_msi.c
index c950fed43b3206e59f4bd7f93060c4f6537a3d14..fee430eadcc651efcb948c968c3dded107fdd983 100644 (file)
--- a/arch/powerpc/platforms/4xx/hsta_msi.c
+++ b/arch/powerpc/platforms/4xx/hsta_msi.c
@@ -47,7 +47,7 @@ static int hsta_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                return -EINVAL;
        }
 
-       for_each_pci_msi_entry(entry, dev) {
+       msi_for_each_desc(entry, &dev->dev, MSI_DESC_NOTASSOCIATED) {
                irq = msi_bitmap_alloc_hwirqs(&ppc4xx_hsta_msi.bmp, 1);
                if (irq < 0) {
                        pr_debug("%s: Failed to allocate msi interrupt\n",
@@ -105,10 +105,7 @@ static void hsta_teardown_msi_irqs(struct pci_dev *dev)
        struct msi_desc *entry;
        int irq;
 
-       for_each_pci_msi_entry(entry, dev) {
-               if (!entry->irq)
-                       continue;
-
+       msi_for_each_desc(entry, &dev->dev, MSI_DESC_ASSOCIATED) {
                irq = hsta_find_hwirq_offset(entry->irq);
 
                /* entry->irq should always be in irq_map */