2 files changed, 3 insertions, 7 deletions

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index a4213c00dffc..cbecb05551bb 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -314,8 +314,7 @@ int dma_supported(struct device *dev, u64 mask)
 {
 #ifdef CONFIG_PCI
         if (mask > 0xffffffff && forbid_dac > 0) {
-                printk(KERN_INFO "PCI: Disallowing DAC for device %s\n",
-                                 dev->bus_id);
+                dev_info(dev, "PCI: Disallowing DAC for device\n");
                 return 0;
         }
 #endif
@@ -342,8 +341,7 @@ int dma_supported(struct device *dev, u64 mask)
            type. Normally this doesn't make any difference, but gives
            more gentle handling of IOMMU overflow. */
         if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) {
-                printk(KERN_INFO "%s: Force SAC with mask %Lx\n",
-                                 dev->bus_id, mask);
+                dev_info(dev, "Force SAC with mask %Lx\n", mask);
                 return 0;
         }
 
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index be60961f8695..df5f142657d2 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -198,9 +198,7 @@ static void iommu_full(struct device *dev, size_t size, int dir)
          * out. Hopefully no network devices use single mappings that big.
          */
 
-        printk(KERN_ERR
-                "PCI-DMA: Out of IOMMU space for %lu bytes at device %s\n",
-                size, dev->bus_id);
+        dev_err(dev, "PCI-DMA: Out of IOMMU space for %lu bytes\n", size);
 
         if (size > PAGE_SIZE*EMERGENCY_PAGES) {
                 if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL)