diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-07-04 04:39:22 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-07-04 06:25:12 -0400 |
commit | b6140914fd079e43ea75a53429b47128584f033a (patch) | |
tree | 2005c34228f4eee63fab0d676f15c26e344962cb | |
parent | a99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff) |
genirq/msi: Remove unused MSI_FLAG_IDENTITY_MAP
No user and we definitely don't want to grow one.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-block@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: linux-nvme@lists.infradead.org
Cc: axboe@fb.com
Cc: agordeev@redhat.com
Link: http://lkml.kernel.org/r/1467621574-8277-2-git-send-email-hch@lst.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | include/linux/msi.h | 6 | ||||
-rw-r--r-- | kernel/irq/msi.c | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index 8b425c66305a..c33abfa0f5a7 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h | |||
@@ -264,12 +264,10 @@ enum { | |||
264 | * callbacks. | 264 | * callbacks. |
265 | */ | 265 | */ |
266 | MSI_FLAG_USE_DEF_CHIP_OPS = (1 << 1), | 266 | MSI_FLAG_USE_DEF_CHIP_OPS = (1 << 1), |
267 | /* Build identity map between hwirq and irq */ | ||
268 | MSI_FLAG_IDENTITY_MAP = (1 << 2), | ||
269 | /* Support multiple PCI MSI interrupts */ | 267 | /* Support multiple PCI MSI interrupts */ |
270 | MSI_FLAG_MULTI_PCI_MSI = (1 << 3), | 268 | MSI_FLAG_MULTI_PCI_MSI = (1 << 2), |
271 | /* Support PCI MSIX interrupts */ | 269 | /* Support PCI MSIX interrupts */ |
272 | MSI_FLAG_PCI_MSIX = (1 << 4), | 270 | MSI_FLAG_PCI_MSIX = (1 << 3), |
273 | }; | 271 | }; |
274 | 272 | ||
275 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, | 273 | int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, |
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 38e89ce7b071..eb5bf2b50b07 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c | |||
@@ -324,7 +324,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, | |||
324 | struct msi_domain_ops *ops = info->ops; | 324 | struct msi_domain_ops *ops = info->ops; |
325 | msi_alloc_info_t arg; | 325 | msi_alloc_info_t arg; |
326 | struct msi_desc *desc; | 326 | struct msi_desc *desc; |
327 | int i, ret, virq = -1; | 327 | int i, ret, virq; |
328 | 328 | ||
329 | ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg); | 329 | ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg); |
330 | if (ret) | 330 | if (ret) |
@@ -332,12 +332,8 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, | |||
332 | 332 | ||
333 | for_each_msi_entry(desc, dev) { | 333 | for_each_msi_entry(desc, dev) { |
334 | ops->set_desc(&arg, desc); | 334 | ops->set_desc(&arg, desc); |
335 | if (info->flags & MSI_FLAG_IDENTITY_MAP) | ||
336 | virq = (int)ops->get_hwirq(info, &arg); | ||
337 | else | ||
338 | virq = -1; | ||
339 | 335 | ||
340 | virq = __irq_domain_alloc_irqs(domain, virq, desc->nvec_used, | 336 | virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used, |
341 | dev_to_node(dev), &arg, false); | 337 | dev_to_node(dev), &arg, false); |
342 | if (virq < 0) { | 338 | if (virq < 0) { |
343 | ret = -ENOSPC; | 339 | ret = -ENOSPC; |