浏览代码

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>
Thomas Gleixner 9 年之前
父节点
当前提交
b6140914fd
共有 2 个文件被更改,包括 4 次插入10 次删除
  1. 2 4
      include/linux/msi.h
  2. 2 6
      kernel/irq/msi.c

+ 2 - 4
include/linux/msi.h

@@ -264,12 +264,10 @@ enum {
 	 * callbacks.
 	 * callbacks.
 	 */
 	 */
 	MSI_FLAG_USE_DEF_CHIP_OPS	= (1 << 1),
 	MSI_FLAG_USE_DEF_CHIP_OPS	= (1 << 1),
-	/* Build identity map between hwirq and irq */
-	MSI_FLAG_IDENTITY_MAP		= (1 << 2),
 	/* Support multiple PCI MSI interrupts */
 	/* Support multiple PCI MSI interrupts */
-	MSI_FLAG_MULTI_PCI_MSI		= (1 << 3),
+	MSI_FLAG_MULTI_PCI_MSI		= (1 << 2),
 	/* Support PCI MSIX interrupts */
 	/* Support PCI MSIX interrupts */
-	MSI_FLAG_PCI_MSIX		= (1 << 4),
+	MSI_FLAG_PCI_MSIX		= (1 << 3),
 };
 };
 
 
 int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,
 int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,

+ 2 - 6
kernel/irq/msi.c

@@ -324,7 +324,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
 	struct msi_domain_ops *ops = info->ops;
 	struct msi_domain_ops *ops = info->ops;
 	msi_alloc_info_t arg;
 	msi_alloc_info_t arg;
 	struct msi_desc *desc;
 	struct msi_desc *desc;
-	int i, ret, virq = -1;
+	int i, ret, virq;
 
 
 	ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg);
 	ret = msi_domain_prepare_irqs(domain, dev, nvec, &arg);
 	if (ret)
 	if (ret)
@@ -332,12 +332,8 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev,
 
 
 	for_each_msi_entry(desc, dev) {
 	for_each_msi_entry(desc, dev) {
 		ops->set_desc(&arg, desc);
 		ops->set_desc(&arg, desc);
-		if (info->flags & MSI_FLAG_IDENTITY_MAP)
-			virq = (int)ops->get_hwirq(info, &arg);
-		else
-			virq = -1;
 
 
-		virq = __irq_domain_alloc_irqs(domain, virq, desc->nvec_used,
+		virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used,
 					       dev_to_node(dev), &arg, false);
 					       dev_to_node(dev), &arg, false);
 		if (virq < 0) {
 		if (virq < 0) {
 			ret = -ENOSPC;
 			ret = -ENOSPC;