Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / amd_iommu.c

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index c949520bd196ec47cf6e572e68cdd67c11b9f84f..4aec6a29e316b56b2be4ef2a48bfed8bcd05ea9d 100644 (file)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3499,8 +3499,6 @@ int __init amd_iommu_init_passthrough(void)
 {
        struct iommu_dev_data *dev_data;
        struct pci_dev *dev = NULL;
-       struct amd_iommu *iommu;
-       u16 devid;
        int ret;
 
        ret = alloc_passthrough_domain();
@@ -3514,12 +3512,6 @@ int __init amd_iommu_init_passthrough(void)
                dev_data = get_dev_data(&dev->dev);
                dev_data->passthrough = true;
 
-               devid = get_device_id(&dev->dev);
-
-               iommu = amd_iommu_rlookup_table[devid];
-               if (!iommu)
-                       continue;
-
                attach_device(&dev->dev, pt_domain);
        }
 
@@ -3999,7 +3991,7 @@ static struct irq_remap_table *get_irq_table(u16 devid, bool ioapic)
        iommu_flush_dte(iommu, devid);
        if (devid != alias) {
                irq_lookup_table[alias] = table;
-               set_dte_irq_entry(devid, table);
+               set_dte_irq_entry(alias, table);
                iommu_flush_dte(iommu, alias);
        }