diff options
| author | Linus Torvalds | 2017-08-26 21:46:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-08-26 21:46:14 +0200 |
| commit | 9716bdb23e1d44276299d3cc90884edbeff00341 (patch) | |
| tree | a337d88aa296e97723e5d5201ead4571c385d8ca | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL (diff) | |
| download | kernel-qcow2-linux-9716bdb23e1d44276299d3cc90884edbeff00341.tar.gz kernel-qcow2-linux-9716bdb23e1d44276299d3cc90884edbeff00341.tar.xz kernel-qcow2-linux-9716bdb23e1d44276299d3cc90884edbeff00341.zip | |
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
| -rw-r--r-- | drivers/pci/msi.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 253d92409bb3..2225afc1cbbb 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -538,12 +538,9 @@ msi_setup_entry(struct pci_dev *dev, int nvec, const struct irq_affinity *affd) struct msi_desc *entry; u16 control; - if (affd) { + if (affd) masks = irq_create_affinity_masks(nvec, affd); - if (!masks) - dev_err(&dev->dev, "can't allocate MSI affinity masks for %d vectors\n", - nvec); - } + /* MSI Entry Initialization */ entry = alloc_msi_entry(&dev->dev, nvec, masks); @@ -679,12 +676,8 @@ static int msix_setup_entries(struct pci_dev *dev, void __iomem *base, struct msi_desc *entry; int ret, i; - if (affd) { + if (affd) masks = irq_create_affinity_masks(nvec, affd); - if (!masks) - dev_err(&dev->dev, "can't allocate MSI-X affinity masks for %d vectors\n", - nvec); - } for (i = 0, curmsk = masks; i < nvec; i++) { entry = alloc_msi_entry(&dev->dev, 1, curmsk); |