From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 10 Dec 2008 19:01:45 +0000 (+0100)
Subject: AMD IOMMU: use calc_devid in prealloc_protection_domains
X-Git-Tag: v2.6.29-rc1~522^2~1^2~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=edcb34da259c503a2ffd37e51a658672ba3bc7a2;p=linux-2.6-omap-h63xx.git

AMD IOMMU: use calc_devid in prealloc_protection_domains

Impact: cleanup

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index e410e97e5b0..3011ea7a3f8 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1543,7 +1543,7 @@ void prealloc_protection_domains(void)
 	u16 devid;
 
 	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-		devid = (dev->bus->number << 8) | dev->devfn;
+		devid = calc_devid(dev->bus->number, dev->devfn);
 		if (devid > amd_iommu_last_bdf)
 			continue;
 		devid = amd_iommu_alias_table[devid];