Skip to content

Commit f2948df

Browse files
committed
x86/pci/xen: Use msi_for_each_desc()
Replace the about to vanish iterators. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Jason Gunthorpe <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ae24e28 commit f2948df

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

arch/x86/pci/xen.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
184184
if (ret)
185185
goto error;
186186
i = 0;
187-
for_each_pci_msi_entry(msidesc, dev) {
187+
msi_for_each_desc(msidesc, &dev->dev, MSI_DESC_NOTASSOCIATED) {
188188
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
189189
(type == PCI_CAP_ID_MSI) ? nvec : 1,
190190
(type == PCI_CAP_ID_MSIX) ?
@@ -235,7 +235,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
235235
if (type == PCI_CAP_ID_MSI && nvec > 1)
236236
return 1;
237237

238-
for_each_pci_msi_entry(msidesc, dev) {
238+
msi_for_each_desc(msidesc, &dev->dev, MSI_DESC_NOTASSOCIATED) {
239239
pirq = xen_allocate_pirq_msi(dev, msidesc);
240240
if (pirq < 0) {
241241
irq = -ENODEV;
@@ -270,7 +270,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
270270
int ret = 0;
271271
struct msi_desc *msidesc;
272272

273-
for_each_pci_msi_entry(msidesc, dev) {
273+
msi_for_each_desc(msidesc, &dev->dev, MSI_DESC_NOTASSOCIATED) {
274274
struct physdev_map_pirq map_irq;
275275
domid_t domid;
276276

@@ -389,11 +389,9 @@ static void xen_teardown_msi_irqs(struct pci_dev *dev)
389389
struct msi_desc *msidesc;
390390
int i;
391391

392-
for_each_pci_msi_entry(msidesc, dev) {
393-
if (msidesc->irq) {
394-
for (i = 0; i < msidesc->nvec_used; i++)
395-
xen_destroy_irq(msidesc->irq + i);
396-
}
392+
msi_for_each_desc(msidesc, &dev->dev, MSI_DESC_ASSOCIATED) {
393+
for (i = 0; i < msidesc->nvec_used; i++)
394+
xen_destroy_irq(msidesc->irq + i);
397395
}
398396
}
399397

0 commit comments

Comments
 (0)