From b18414eb5db05ade7448c0792a0575d641c42601 Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah.khan@hp.com>
Date: Mon, 8 Oct 2012 18:36:11 -0600
Subject: [PATCH] --- yaml --- r: 343438 b: refs/heads/master c:
 d151f63f20133aef9dbda209faddebcddbfccf31 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/virt/kvm/iommu.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b4dde59b6d9d..0707d27e18f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6785def8368f9a69505797fcbd9f280d91b673e
+refs/heads/master: d151f63f20133aef9dbda209faddebcddbfccf31
diff --git a/trunk/virt/kvm/iommu.c b/trunk/virt/kvm/iommu.c
index 037cb6730e68..18e1e30019e3 100644
--- a/trunk/virt/kvm/iommu.c
+++ b/trunk/virt/kvm/iommu.c
@@ -168,11 +168,7 @@ int kvm_assign_device(struct kvm *kvm,
 
 	r = iommu_attach_device(domain, &pdev->dev);
 	if (r) {
-		printk(KERN_ERR "assign device %x:%x:%x.%x failed",
-			pci_domain_nr(pdev->bus),
-			pdev->bus->number,
-			PCI_SLOT(pdev->devfn),
-			PCI_FUNC(pdev->devfn));
+		dev_err(&pdev->dev, "kvm assign device failed ret %d", r);
 		return r;
 	}