Skip to content

Commit 9716bdb

Browse files
committed
Merge tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Remove needlessly alarming MSI affinity warning (this is not actually a bug fix, but the warning prompts unnecessary bug reports)" * tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL
2 parents c153e62 + 8e1101d commit 9716bdb

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

drivers/pci/msi.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,9 @@ msi_setup_entry(struct pci_dev *dev, int nvec, const struct irq_affinity *affd)
538538
struct msi_desc *entry;
539539
u16 control;
540540

541-
if (affd) {
541+
if (affd)
542542
masks = irq_create_affinity_masks(nvec, affd);
543-
if (!masks)
544-
dev_err(&dev->dev, "can't allocate MSI affinity masks for %d vectors\n",
545-
nvec);
546-
}
543+
547544

548545
/* MSI Entry Initialization */
549546
entry = alloc_msi_entry(&dev->dev, nvec, masks);
@@ -679,12 +676,8 @@ static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,
679676
struct msi_desc *entry;
680677
int ret, i;
681678

682-
if (affd) {
679+
if (affd)
683680
masks = irq_create_affinity_masks(nvec, affd);
684-
if (!masks)
685-
dev_err(&dev->dev, "can't allocate MSI-X affinity masks for %d vectors\n",
686-
nvec);
687-
}
688681

689682
for (i = 0, curmsk = masks; i < nvec; i++) {
690683
entry = alloc_msi_entry(&dev->dev, 1, curmsk);

0 commit comments

Comments
 (0)