summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorThomas Gleixner2016-09-15 20:54:40 +0200
committerThomas Gleixner2016-09-15 20:54:40 +0200
commit0a30d69195604f136a4e3bfaf453f742e583ce95 (patch)
tree6589250e91787090ac98b0efff1ae7d8022b4594 /drivers/base
parentMerge tag 'irqchip-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ma... (diff)
parentpci/msi: Retrieve affinity for a vector (diff)
downloadkernel-qcow2-linux-0a30d69195604f136a4e3bfaf453f742e583ce95.tar.gz
kernel-qcow2-linux-0a30d69195604f136a4e3bfaf453f742e583ce95.tar.xz
kernel-qcow2-linux-0a30d69195604f136a4e3bfaf453f742e583ce95.zip
Merge branch 'irq/for-block' into irq/core
Add the new irq spreading infrastructure.
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform-msi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index 279e53989374..be6a599bc0c1 100644
--- a/drivers/base/platform-msi.c
+++ b/drivers/base/platform-msi.c
@@ -142,13 +142,12 @@ static int platform_msi_alloc_descs_with_irq(struct device *dev, int virq,
}
for (i = 0; i < nvec; i++) {
- desc = alloc_msi_entry(dev);
+ desc = alloc_msi_entry(dev, 1, NULL);
if (!desc)
break;
desc->platform.msi_priv_data = data;
desc->platform.msi_index = base + i;
- desc->nvec_used = 1;
desc->irq = virq ? virq + i : 0;
list_add_tail(&desc->list, dev_to_msi_list(dev));